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

Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09

Browse Source
This commit is contained in:
GordonTheTurtle
2019-04-13 00:59:46 +00:00
parent d8c7e6f27c e89bd1ab59
commit 183cc3650c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/packaging/deb/Makefile
View File

@ -29,6 +29,7 @@ RUN=docker run --rm -i \
-e DEB_VERSION=$(word 1, $(DEB_VERSION)) \
-e VERSION=$(word 2, $(DEB_VERSION)) \
-e DOCKER_GITCOMMIT=$(GITCOMMIT) \
-e PLATFORM \
-v $(CURDIR)/debbuild/$@:/build \
debbuild-$@/$(ARCH)

3
components/packaging/rpm/Makefile
View File

@ -28,7 +28,8 @@ BUILD?=docker build \
SPEC_FILES?=docker-ce.spec docker-ce-cli.spec
SPECS?=$(addprefix SPECS/, $(SPEC_FILES))
RPMBUILD=docker run --privileged --rm -i\
RPMBUILD=docker run --privileged --rm -i \
-e PLATFORM \
-v $(CURDIR)/rpmbuild/SOURCES:/root/rpmbuild/SOURCES \
-v $(CURDIR)/rpmbuild/RPMS:/root/rpmbuild/RPMS \
-v $(CURDIR)/rpmbuild/SRPMS:/root/rpmbuild/SRPMS