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

Remove shell directive so target will work

Browse Source 
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 93fcc8443b504c94beaef697ec6f27748b40d656
Component: packaging
This commit is contained in:
Jose Bigio
2018-08-07 13:21:18 -07:00
parent d72fa21d55
commit 3570421f62
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/packaging/deb/Makefile
+1 -1
View File
@@ -30,7 +30,7 @@ clean: ## remove build artifacts
engine-$(ARCH).tar:
$(MAKE) -C ../image image-linux
docker save -o $@ $(shell cat ../image/image-linux)
docker save -o $@ $$(cat ../image/image-linux)
.PHONY: deb
deb: ubuntu debian raspbian ## build all deb packages
components/packaging/image/Makefile
+4
View File
@@ -32,6 +32,10 @@ image-linux: $(ENGINE_DIR)/Dockerfile.engine
--file $< $(ENGINE_DIR)
echo $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION).$(ARCH) > $@
engine-$(ARCH).tar: image-linux
docker save -o $@ $$(cat $<)
.PHONY: release
release:
docker push $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION).$(ARCH)
components/packaging/rpm/Makefile
+1 -1
View File
@@ -42,7 +42,7 @@ centos: centos-7 ## build all centos rpm packages
engine-$(ARCH).tar:
$(MAKE) -C ../image image-linux
docker save $(shell cat ../image/image-linux) > $@
docker save -o $@ $$(cat ../image/image-linux)
.PHONY: fedora-28
fedora-28: engine-$(ARCH).tar rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz ## build fedora-28 rpm packages