Simplify build of the slim etcd-manager image

kubernetes-sigs · Feb 1, 2023 · 9360dae · 9360dae
1 parent 638afd9
commit 9360dae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/etcd-manager/Makefile b/etcd-manager/Makefile
@@ -65,11 +65,11 @@ push-etcd-manager-slim:
 .PHONY: push-etcd-manager-slim-manifest
 push-etcd-manager-slim-manifest:
 	DOCKER_CLI_EXPERIMENTAL=enabled docker manifest create \
-		$(IMAGE_BASE)etcd-manager:$(STABLE_DOCKER_TAG)-slim \
-		$(IMAGE_BASE)etcd-manager:$(STABLE_DOCKER_TAG)-slim-amd64 \
-		$(IMAGE_BASE)etcd-manager:$(STABLE_DOCKER_TAG)-slim-arm64
+		$(IMAGE_BASE)etcd-manager-slim:$(STABLE_DOCKER_TAG) \
+		$(IMAGE_BASE)etcd-manager-slim:$(STABLE_DOCKER_TAG)-amd64 \
+		$(IMAGE_BASE)etcd-manager-slim:$(STABLE_DOCKER_TAG)-arm64
 	DOCKER_CLI_EXPERIMENTAL=enabled docker manifest push --purge \
-		$(IMAGE_BASE)etcd-manager:$(STABLE_DOCKER_TAG)-slim
+		$(IMAGE_BASE)etcd-manager-slim:$(STABLE_DOCKER_TAG)
 
 .PHONY: push-etcd-dump
 push-etcd-dump:

diff --git a/etcd-manager/images/BUILD b/etcd-manager/images/BUILD
@@ -146,10 +146,10 @@ container_push(
     format = "Docker",
     image = ":etcd-manager-slim",
     registry = "{STABLE_DOCKER_REGISTRY}",
-    repository = "{STABLE_DOCKER_IMAGE_PREFIX}etcd-manager",
+    repository = "{STABLE_DOCKER_IMAGE_PREFIX}etcd-manager-slim",
     tag = select({
-        "@io_bazel_rules_go//go/platform:amd64": "{STABLE_DOCKER_TAG}-slim-amd64",
-        "@io_bazel_rules_go//go/platform:arm64": "{STABLE_DOCKER_TAG}-slim-arm64",
+        "@io_bazel_rules_go//go/platform:amd64": "{STABLE_DOCKER_TAG}-amd64",
+        "@io_bazel_rules_go//go/platform:arm64": "{STABLE_DOCKER_TAG}-arm64",
     }),
 )