Skip to content

Commit

Permalink
chore: move dev dockerfile to match our convention
Browse files Browse the repository at this point in the history
We typically put the extra details as a suffix
  • Loading branch information
06kellyjac committed Jan 2, 2024
1 parent c6a3c8c commit 49546c3
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ terraform/workspaces/simulator/.terraform/
.dockerignore
.editorconfig
.gitignore
dev.Dockerfile
Dockerfile.dev
Dockerfile
LICENSE
Makefile
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: ./dev.Dockerfile
file: ./Dockerfile.dev
tags: |
controlplane/simulator:dev
load: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: ./dev.Dockerfile
file: ./Dockerfile.dev
tags: |
controlplane/simulator:dev
load: true
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
file: ./dev.Dockerfile
file: ./Dockerfile.dev
tags: 'controlplane/simulator:dev'
load: false ## push and load cannot be set at the same time
push: true
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ lint: ## Lint the code
golangci-lint run -c .golangci.yml

simulator-dev-image: lint ## Lint the code and build the development Docker image
docker build -t $(SIMULATOR_IMAGE):dev -f dev.Dockerfile .
docker build -t $(SIMULATOR_IMAGE):dev -f Dockerfile.dev .

simulator-image: simulator-dev-image ## Build the Docker image for the simulator
docker build -t $(SIMULATOR_IMAGE) .
Expand Down

0 comments on commit 49546c3

Please sign in to comment.