From 5b4bedfa3965c473f01039960e7ede4b2a4c4d2e Mon Sep 17 00:00:00 2001 From: Ashley Davis Date: Fri, 19 Apr 2024 16:24:05 +0100 Subject: [PATCH] re-add removed targets, update base images Signed-off-by: Ashley Davis --- make/02_mod.mk | 7 +++++++ make/base_images.mk | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/make/02_mod.mk b/make/02_mod.mk index 51e24227b..e75724ca3 100644 --- a/make/02_mod.mk +++ b/make/02_mod.mk @@ -50,3 +50,10 @@ tidy: cd cmd/webhook && go mod tidy cd test/integration && go mod tidy cd test/e2e && go mod tidy + +.PHONY: update-base-images +update-base-images: | $(NEEDS_CRANE) + CRANE=$(CRANE) ./hack/latest-base-images.sh + +.PHONY: update-licenses +update-licenses: generate-licenses diff --git a/make/base_images.mk b/make/base_images.mk index 9d1c6719b..51794639d 100644 --- a/make/base_images.mk +++ b/make/base_images.mk @@ -1,12 +1,12 @@ # +skip_license_check # autogenerated by hack/latest-base-images.sh -STATIC_BASE_IMAGE_amd64 := gcr.io/distroless/static-debian12@sha256:f8ceaf8f99c9d3b1c533135c7788db090599716b581f99a1b8f4df186927a0d0 -STATIC_BASE_IMAGE_arm64 := gcr.io/distroless/static-debian12@sha256:5edb5ed66e0e427f00f9424b25d7cbcf6b5ca49ad80f7753cc78a2d390a98636 -STATIC_BASE_IMAGE_s390x := gcr.io/distroless/static-debian12@sha256:683be24c8165368e904b25225b75ba2f09bbdc63858e865847b79de236468841 -STATIC_BASE_IMAGE_arm := gcr.io/distroless/static-debian12@sha256:f813b5a0c22a5e09e5a4b04856c138507f0a0732ecf8875a38b121b4becd02c1 -STATIC_BASE_IMAGE_ppc64le := gcr.io/distroless/static-debian12@sha256:52697bbfb7e7ed6331aadda10a08ee3342b22dc083cab3efad201d9fc8bffb14 -DYNAMIC_BASE_IMAGE_amd64 := gcr.io/distroless/base-debian12@sha256:21bba2fd3d88d655b51eafa0319fab28038330ff365705b8ae7f0dd6f948875a -DYNAMIC_BASE_IMAGE_arm64 := gcr.io/distroless/base-debian12@sha256:ada49a21f68109b496a8b194deb11fd2eade79c3611f1d90764c350d3270c7c2 -DYNAMIC_BASE_IMAGE_s390x := gcr.io/distroless/base-debian12@sha256:3fe3b0658cf5d572c8be1c6a2326696d9d5aac68a87af30f996d6aaf1b957834 -DYNAMIC_BASE_IMAGE_arm := gcr.io/distroless/base-debian12@sha256:5e48c4605a28f2221d5a97371119b898560f00579a1ae532756801f78dbaa922 -DYNAMIC_BASE_IMAGE_ppc64le := gcr.io/distroless/base-debian12@sha256:c1dde7a970a3e47b41f803b6c38d044e59db44e410ccce8cad91d0447a5a5b95 +STATIC_BASE_IMAGE_amd64 := gcr.io/distroless/static-debian12@sha256:262ae336f8e9291f8edc9a71a61d5d568466edc1ea4818752d4af3d230a7f9ef +STATIC_BASE_IMAGE_arm64 := gcr.io/distroless/static-debian12@sha256:f05686e02ba3e9ff0d947c5ec4ec9d8f00a4bfae0309a2704650db7dca8d6c48 +STATIC_BASE_IMAGE_s390x := gcr.io/distroless/static-debian12@sha256:acaf1e1916e104d8d3a53a0275f0ea3ac7cdb264b3516fd20c3a402970f56af1 +STATIC_BASE_IMAGE_arm := gcr.io/distroless/static-debian12@sha256:4d8615d6516c818404e275747ab86ac100f3fc77208b31ec8d528f86c64a3caf +STATIC_BASE_IMAGE_ppc64le := gcr.io/distroless/static-debian12@sha256:79d0937b157ae30ef2b6fba72b0c381a810a7a8e41af64fac82f295d0ef93507 +DYNAMIC_BASE_IMAGE_amd64 := gcr.io/distroless/base-debian12@sha256:a7317ec9f04dbe6b0a3bc1b8ccd21b765548e3f7c79d24b8b80827fd3c531d0e +DYNAMIC_BASE_IMAGE_arm64 := gcr.io/distroless/base-debian12@sha256:e9318eb15bde98ad72ca879dfde33f4a1ad6d336dbcf7c2a0f7d12e5d453e1f4 +DYNAMIC_BASE_IMAGE_s390x := gcr.io/distroless/base-debian12@sha256:a4cbe6fcbd38fc8aae556cf85d12ab082c1dbe4844fdf2136932dca1468c9dc2 +DYNAMIC_BASE_IMAGE_arm := gcr.io/distroless/base-debian12@sha256:abc3f175ed8ef7ff91006532d8007b3cda91b322cc1e2d0440fa7f49e6a5cacd +DYNAMIC_BASE_IMAGE_ppc64le := gcr.io/distroless/base-debian12@sha256:3e9d6b7245aa8858db11bfef3479d0cda2abca912ede1b7788933fec194f8154