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

Merge pull request #105 from thaJeztah/remove-experimental

Browse Source 
Remove "experimental" env-vars
Upstream-commit: b2dd1df6d30da0b57a8838120b82c6c129414c85
Component: packaging
This commit is contained in:
Eli Uriegas
2018-05-14 15:44:12 -07:00
committed by GitHub
parent f71c487025 830a000faa
commit fa0e6a4fbc
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/packaging/deb/Makefile
View File

@ -5,7 +5,6 @@ CLI_DIR:=$(CURDIR)/../../cli
GITCOMMIT?=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
VERSION?=0.0.0-dev
DEB_VERSION=$(shell ./gen-deb-ver $(ENGINE_DIR) "$(VERSION)")
DOCKER_EXPERIMENTAL:=0
CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown
EPOCH?=

2
components/packaging/rpm/Makefile
View File

@ -3,7 +3,6 @@ ENGINE_DIR:=$(CURDIR)/../../engine
CLI_DIR:=$(CURDIR)/../../cli
GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD)
VERSION?=0.0.0-dev
DOCKER_EXPERIMENTAL=0
GEN_RPM_VER=$(shell ./gen-rpm-ver $(ENGINE_DIR) $(VERSION))
CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown
RPMBUILD=docker run --privileged --rm -i\
@ -18,7 +17,6 @@ RPMBUILD_FLAGS=-ba\
--define '_release $(word 2,$(GEN_RPM_VER))' \
--define '_version $(word 1,$(GEN_RPM_VER))' \
--define '_origversion $(VERSION)' \
--define '_experimental $(DOCKER_EXPERIMENTAL)' \
SPECS/docker-ce.spec
.PHONY: help