toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #234 from jose-bigio/18.09_cherry_pick

Browse Source 
[18.09] Make -dm image based not tag based
Upstream-commit: 4264c8e1a826c76b0fde570f867cc7e7c6cd30bb
Component: packaging
This commit is contained in:
Eli Uriegas
2018-09-21 15:06:42 -07:00
committed by GitHub
parent 04ec85f5b8 46a53355c9
commit 8da1ad1c75
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/packaging/image/Makefile
+2 -2
View File
@@ -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