From f05b661d8f7d2f15a03fab794a7ae7959a30030b Mon Sep 17 00:00:00 2001 From: Charlie Egan Date: Tue, 25 Jun 2024 11:53:05 +0100 Subject: [PATCH] build: Use chainguard images from dockerhub Merge after https://github.com/open-policy-agent/opa-envoy-plugin/pull/558 Follows https://github.com/open-policy-agent/opa/pull/6830 Signed-off-by: Charlie Egan --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3ce8b0623..e651d4145 100644 --- a/Makefile +++ b/Makefile @@ -97,17 +97,17 @@ image-static: image-quick: sed -e 's/GOARCH/$(GOARCH)/g' Dockerfile > .Dockerfile_$(GOARCH) - docker build -t $(IMAGE):$(VERSION) --build-arg BASE=cgr.dev/chainguard/glibc-dynamic -f .Dockerfile_$(GOARCH) . + docker build -t $(IMAGE):$(VERSION) --build-arg BASE=chainguard/glibc-dynamic -f .Dockerfile_$(GOARCH) . docker tag $(IMAGE):$(VERSION) $(IMAGE):$(VERSION_ISTIO) image-quick-rootless: sed -e 's/GOARCH/$(GOARCH)/g' Dockerfile > .Dockerfile_$(GOARCH) - docker build -t $(IMAGE):$(VERSION)-rootless --build-arg USER=1000:1000 --build-arg BASE=cgr.dev/chainguard/glibc-dynamic -f .Dockerfile_$(GOARCH) . + docker build -t $(IMAGE):$(VERSION)-rootless --build-arg USER=1000:1000 --build-arg BASE=chainguard/glibc-dynamic -f .Dockerfile_$(GOARCH) . docker tag $(IMAGE):$(VERSION)-rootless $(IMAGE):$(VERSION_ISTIO)-rootless image-quick-static: sed -e 's/GOARCH/$(GOARCH)/g' Dockerfile > .Dockerfile_$(GOARCH) - docker build -t $(IMAGE):$(VERSION)-static --build-arg BASE=cgr.dev/chainguard/static:latest -f .Dockerfile_$(GOARCH) . + docker build -t $(IMAGE):$(VERSION)-static --build-arg BASE=chainguard/static:latest -f .Dockerfile_$(GOARCH) . docker tag $(IMAGE):$(VERSION)-static $(IMAGE):$(VERSION_ISTIO)-static push: