From 46a53355c9f5529bde1958c72f8eec312bbcd6c6 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Fri, 21 Sep 2018 18:08:55 +0000 Subject: [PATCH] Make -dm image based not tag based Signed-off-by: Eli Uriegas (cherry picked from commit 206d61f29d1722ae3e319e22a4c5c88d1baf6e13) Signed-off-by: Jose Bigio Upstream-commit: aea8f6a1db61a0bb0748f3420e125fcc06e8e0a6 Component: packaging --- components/packaging/image/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/packaging/image/Makefile b/components/packaging/image/Makefile index 499ad5804a..10414328e0 100644 --- a/components/packaging/image/Makefile +++ b/components/packaging/image/Makefile @@ -73,10 +73,10 @@ engine-$(ARCH).tar: engine-$(ARCH)-docker-compat.tar $(DOCKER2OCI) engine-$(ARCH)-docker-compat.tar: image-linux docker save -o $@ $$(cat $<) +image-linux-dm: ENGINE_IMAGE:=$(ENGINE_IMAGE)-dm image-linux-dm: $(ENGINE_DIR)/Dockerfile.engine-dm $(IMAGE_BUILD) - docker tag $(IMAGE_WITH_TAG) $(IMAGE_WITH_TAG)-dm - echo $(IMAGE_WITH_TAG)-dm > $@ + echo $(IMAGE_WITH_TAG) > $@ engine-$(ARCH)-dm.tar: engine-$(ARCH)-dm-docker-compat.tar $(DOCKER2OCI) mkdir -p artifacts