Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: use chainguard images from dockerhub #6830

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
build: use chainguard images from dockerhub
Signed-off-by: Stephan Renatus <stephan@styra.com>
  • Loading branch information
srenatus committed Jun 25, 2024
commit 4ce6da0c72d739159a59ca1f15e04c50cf831822
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -334,28 +334,28 @@ image-quick-%: ensure-executable-bin
ifneq ($(GOARCH),arm64) # build only static images for arm64
$(DOCKER) build \
-t $(DOCKER_IMAGE):$(VERSION) \
--build-arg BASE=cgr.dev/chainguard/glibc-dynamic \
--build-arg BASE=chainguard/glibc-dynamic \
--build-arg BIN_DIR=$(RELEASE_DIR) \
--platform linux/$* \
.
$(DOCKER) build \
-t $(DOCKER_IMAGE):$(VERSION)-debug \
--build-arg BASE=cgr.dev/chainguard/glibc-dynamic:latest-dev \
--build-arg BASE=chainguard/glibc-dynamic:latest-dev \
--build-arg BIN_DIR=$(RELEASE_DIR) \
--platform linux/$* \
.
endif
$(DOCKER) build \
-t $(DOCKER_IMAGE):$(VERSION)-static \
--build-arg BASE=cgr.dev/chainguard/static:latest \
--build-arg BASE=chainguard/static:latest \
--build-arg BIN_DIR=$(RELEASE_DIR) \
--build-arg BIN_SUFFIX=_static \
--platform linux/$* \
.

$(DOCKER) build \
-t $(DOCKER_IMAGE):$(VERSION)-static-debug \
--build-arg BASE=cgr.dev/chainguard/busybox:latest-glibc \
--build-arg BASE=chainguard/busybox:latest-glibc \
--build-arg BIN_DIR=$(RELEASE_DIR) \
--build-arg BIN_SUFFIX=_static \
--platform linux/$* \
Expand All @@ -366,15 +366,15 @@ endif
push-manifest-list-%: ensure-executable-bin
$(DOCKER) buildx build \
--tag $(DOCKER_IMAGE):$* \
--build-arg BASE=cgr.dev/chainguard/glibc-dynamic:latest \
--build-arg BASE=chainguard/glibc-dynamic:latest \
--build-arg BIN_DIR=$(RELEASE_DIR) \
--platform $(DOCKER_PLATFORMS) \
--provenance=false \
--push \
.
$(DOCKER) buildx build \
--tag $(DOCKER_IMAGE):$*-debug \
--build-arg BASE=cgr.dev/chainguard/glibc-dynamic:latest-dev \
--build-arg BASE=chainguard/glibc-dynamic:latest-dev \
--build-arg BIN_DIR=$(RELEASE_DIR) \
--platform $(DOCKER_PLATFORMS) \
--provenance=false \
Expand All @@ -383,7 +383,7 @@ push-manifest-list-%: ensure-executable-bin

$(DOCKER) buildx build \
--tag $(DOCKER_IMAGE):$*-static \
--build-arg BASE=cgr.dev/chainguard/static:latest \
--build-arg BASE=chainguard/static:latest \
--build-arg BIN_DIR=$(RELEASE_DIR) \
--build-arg BIN_SUFFIX=_static \
--platform $(DOCKER_PLATFORMS_STATIC) \
Expand All @@ -393,7 +393,7 @@ push-manifest-list-%: ensure-executable-bin

$(DOCKER) buildx build \
--tag $(DOCKER_IMAGE):$*-static-debug \
--build-arg BASE=cgr.dev/chainguard/busybox:latest-glibc \
--build-arg BASE=chainguard/busybox:latest-glibc \
--build-arg BIN_DIR=$(RELEASE_DIR) \
--build-arg BIN_SUFFIX=_static \
--platform $(DOCKER_PLATFORMS_STATIC) \
Expand Down