From 434a8b60cc37a74ae547998066befcf5c3a2a138 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Wed, 12 Sep 2018 06:28:16 -0700 Subject: [PATCH] Remove the arch in the image tag Signed-off-by: Eli Uriegas (cherry picked from commit f7b0d0742e4b23e3442ce78cbc0d4c190929eb96) Signed-off-by: Eli Uriegas Upstream-commit: 0fb14f8b914ada119d74818637e4a13176a51410 Component: packaging --- components/packaging/image/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/packaging/image/Makefile b/components/packaging/image/Makefile index b0ba519742..c3be6bb344 100644 --- a/components/packaging/image/Makefile +++ b/components/packaging/image/Makefile @@ -35,7 +35,7 @@ $(ENGINE_DIR)/Dockerfile.engine: # builds across multiple archs because the base images # utilize manifests image-linux: $(ENGINE_DIR)/Dockerfile.engine - docker build -t $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION).$(ARCH) \ + docker build -t $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION) \ --build-arg GO_IMAGE="$(ENGINE_GO_IMAGE)" \ --build-arg VERSION="$(STATIC_VERSION)" \ --build-arg GITCOMMIT="$$(cd $(ENGINE_DIR) && git rev-parse --short=7 HEAD)" \ @@ -44,7 +44,7 @@ image-linux: $(ENGINE_DIR)/Dockerfile.engine --build-arg PRODUCT="$(PRODUCT)" \ --build-arg DEFAULT_PRODUCT_LICENSE="$(DEFAULT_PRODUCT_LICENSE)" \ --file $< $(ENGINE_DIR) - echo $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION).$(ARCH) > $@ + echo $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION) > $@ DOCKER2OCI=artifacts/docker2oci $(DOCKER2OCI): @@ -66,4 +66,4 @@ engine-$(ARCH)-docker-compat.tar: image-linux .PHONY: release release: - docker push $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION).$(ARCH) + docker push $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION)