Skip to content

Commit a9eebf2

Browse files
authored
Prevent pulling builder when building from source (#1937)
This is a workaround to a podman issue in which, adding --platform to a pull command, will cause podman to always pull the image. This is particularly annoying when testing changes to the builder image, since setting it to run will overwrite the local image and pull an existing one instead.
1 parent 6014f4e commit a9eebf2

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ ifneq ($(BUILD_BUILDER_IMAGE), false)
2828
-t quay.io/stackrox-io/collector-builder:$(COLLECTOR_BUILDER_TAG) \
2929
-f "$(CURDIR)/builder/Dockerfile" \
3030
"$(CURDIR)/builder"
31+
else
32+
docker pull --platform ${PLATFORM} \
33+
quay.io/stackrox-io/collector-builder:$(COLLECTOR_BUILDER_TAG)
3134
endif
3235

3336
collector: check-builder
@@ -82,7 +85,7 @@ endif
8285
start-builder: builder teardown-builder
8386
docker run -d \
8487
--name $(COLLECTOR_BUILDER_NAME) \
85-
--pull missing \
88+
--pull never \
8689
--platform ${PLATFORM} \
8790
-v $(CURDIR):$(CURDIR) \
8891
$(if $(LOCAL_SSH_PORT),-p $(LOCAL_SSH_PORT):22 )\

0 commit comments

Comments
 (0)