Skip to content

Commit 1dd27b3

Browse files
ci: fix bake file and gha steps
Remove hard-coded port arg
1 parent 2657aa5 commit 1dd27b3

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

.github/workflows/docker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ jobs:
9494
targets: multi-platform
9595
push: ${{ github.event_name != 'pull_request' }}
9696
set: |
97+
*.tags=${{ steps.meta.outputs.tags }}
9798
*.cache-from=type=gha,scope=${{ github.workflow }}
9899
*.cache-to=type=gha,mode=max,scope=${{ github.workflow }}
99100
*.platform=linux/amd64,linux/arm64
100101
*.args.PYTHON_VERSION=3.11
101-
*.args.PORT=3100
102102
REGISTRY_URL=${{ env.REGISTRY_URL }}
103103
REGISTRY_USER=${{ env.REGISTRY_USER }}
104104
IMAGE_NAME=${{ env.IMAGE_NAME }}

docker-bake.hcl

+6-10
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,19 @@ variable "DOCKERFILE" {
2020
}
2121

2222
// Base target with shared configuration
23-
target "docker-metadata-action" {
24-
tags = [
25-
"${REGISTRY_URL}/${REGISTRY_USER}/${IMAGE_NAME}:${TAG}",
26-
"${REGISTRY_URL}/${REGISTRY_USER}/${IMAGE_NAME}:latest",
27-
]
28-
}
29-
30-
// Default target that extends the base
31-
target "build" {
32-
inherits = ["docker-metadata-action"]
23+
target "base" {
3324
context = "."
3425
dockerfile = "${DOCKERFILE}"
3526
args = {
3627
PYTHON_VERSION = "3.11"
3728
}
3829
}
3930

31+
// Default target that extends the base
32+
target "build" {
33+
inherits = ["base"]
34+
}
35+
4036
// Group target to build both platforms
4137
group "default" {
4238
targets = ["build"]

0 commit comments

Comments
 (0)