Skip to content

Commit 0310378

Browse files
JAORMXclaude
andcommitted
fix: use CONTAINER_ENGINE for image builds to avoid buildx isolation
The docker-container buildx driver cannot resolve locally-built images for FROM references. Switch image tasks to use a CONTAINER_ENGINE variable (defaults to docker, falls back to podman) matching brood-box's pattern. Add run:once to build-image-base to prevent redundant rebuilds when multiple runtime images depend on it in parallel. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 57982e4 commit 0310378

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

Taskfile.yaml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ vars:
2222
sh: uname -m | sed 's/x86_64/amd64/;s/aarch64/arm64/'
2323
HOST_OS:
2424
sh: uname -s | tr '[:upper:]' '[:lower:]'
25+
CONTAINER_ENGINE:
26+
sh: echo ${CONTAINER_ENGINE:-$(command -v docker >/dev/null 2>&1 && echo docker || echo podman)}
2527
LDFLAGS: >-
2628
-X main.version={{.VERSION}}
2729
-X main.commit={{.COMMIT}}
@@ -226,8 +228,9 @@ tasks:
226228

227229
build-image-base:
228230
desc: Build base runtime image (shared Alpine layer)
231+
run: once
229232
cmds:
230-
- docker buildx build --load -t {{.IMAGE_REGISTRY}}/base:{{.IMAGE_TAG}} -t {{.IMAGE_REGISTRY}}/base:latest images/base/
233+
- "{{.CONTAINER_ENGINE}} build -t {{.IMAGE_REGISTRY}}/base:{{.IMAGE_TAG}} -t {{.IMAGE_REGISTRY}}/base:latest images/base/"
231234
sources:
232235
- images/base/Dockerfile
233236

@@ -236,7 +239,7 @@ tasks:
236239
deps: [build-image-base]
237240
cmds:
238241
- >-
239-
docker buildx build --load
242+
{{.CONTAINER_ENGINE}} build
240243
--build-arg BASE_IMAGE={{.IMAGE_REGISTRY}}/base:latest
241244
-t {{.IMAGE_REGISTRY}}/python:{{.IMAGE_TAG}}
242245
-t {{.IMAGE_REGISTRY}}/python:latest images/python/
@@ -249,7 +252,7 @@ tasks:
249252
deps: [build-image-base]
250253
cmds:
251254
- >-
252-
docker buildx build --load
255+
{{.CONTAINER_ENGINE}} build
253256
--build-arg BASE_IMAGE={{.IMAGE_REGISTRY}}/base:latest
254257
-t {{.IMAGE_REGISTRY}}/node:{{.IMAGE_TAG}}
255258
-t {{.IMAGE_REGISTRY}}/node:latest images/node/
@@ -262,7 +265,7 @@ tasks:
262265
deps: [build-image-base]
263266
cmds:
264267
- >-
265-
docker buildx build --load
268+
{{.CONTAINER_ENGINE}} build
266269
--build-arg BASE_IMAGE={{.IMAGE_REGISTRY}}/base:latest
267270
-t {{.IMAGE_REGISTRY}}/shell:{{.IMAGE_TAG}}
268271
-t {{.IMAGE_REGISTRY}}/shell:latest images/shell/
@@ -278,10 +281,10 @@ tasks:
278281
desc: Push all runtime images to registry
279282
deps: [build-images]
280283
cmds:
281-
- docker push {{.IMAGE_REGISTRY}}/base:{{.IMAGE_TAG}}
282-
- docker push {{.IMAGE_REGISTRY}}/python:{{.IMAGE_TAG}}
283-
- docker push {{.IMAGE_REGISTRY}}/node:{{.IMAGE_TAG}}
284-
- docker push {{.IMAGE_REGISTRY}}/shell:{{.IMAGE_TAG}}
284+
- "{{.CONTAINER_ENGINE}} push {{.IMAGE_REGISTRY}}/base:{{.IMAGE_TAG}}"
285+
- "{{.CONTAINER_ENGINE}} push {{.IMAGE_REGISTRY}}/python:{{.IMAGE_TAG}}"
286+
- "{{.CONTAINER_ENGINE}} push {{.IMAGE_REGISTRY}}/node:{{.IMAGE_TAG}}"
287+
- "{{.CONTAINER_ENGINE}} push {{.IMAGE_REGISTRY}}/shell:{{.IMAGE_TAG}}"
285288

286289
run:
287290
desc: Build and run the server

0 commit comments

Comments
 (0)