diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index 960f68b876..c707012e92 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -7,7 +7,7 @@ VERSION?=0.0.0-dev GO_VERSION:=1.10.3 DEB_VERSION=$(shell ./gen-deb-ver $(ENGINE_DIR) "$(VERSION)") CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown -EPOCH?= +EPOCH?=1 BUILD=docker build --build-arg GO_VERSION=$(GO_VERSION) -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . RUN=docker run --rm -i \ diff --git a/components/packaging/rpm/Makefile b/components/packaging/rpm/Makefile index edcade9976..fab09f96e0 100644 --- a/components/packaging/rpm/Makefile +++ b/components/packaging/rpm/Makefile @@ -5,8 +5,10 @@ GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) VERSION?=0.0.0-dev GO_VERSION:=1.10.3 GEN_RPM_VER=$(shell ./gen-rpm-ver $(ENGINE_DIR) $(VERSION)) +EPOCH?=1 CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown RPMBUILD=docker run --privileged --rm -i\ + -e EPOCH="$(EPOCH)" \ -v $(CURDIR)/rpmbuild/SOURCES:/root/rpmbuild/SOURCES \ -v $(CURDIR)/rpmbuild/BUILD:/root/rpmbuild/BUILD \ -v $(CURDIR)/rpmbuild/BUILDROOT:/root/rpmbuild/BUILDROOT \ diff --git a/components/packaging/rpm/centos-7/docker-ce.spec b/components/packaging/rpm/centos-7/docker-ce.spec index 9a65893c5a..41318c4af9 100644 --- a/components/packaging/rpm/centos-7/docker-ce.spec +++ b/components/packaging/rpm/centos-7/docker-ce.spec @@ -1,6 +1,7 @@ Name: docker-ce Version: %{_version} Release: %{_release}%{?dist} +Epoch: %{getenv:EPOCH} Summary: The open-source application container engine Group: Tools/Docker License: ASL 2.0 diff --git a/components/packaging/rpm/fedora-27/docker-ce.spec b/components/packaging/rpm/fedora-27/docker-ce.spec index 337831fae5..cc13455dd1 100644 --- a/components/packaging/rpm/fedora-27/docker-ce.spec +++ b/components/packaging/rpm/fedora-27/docker-ce.spec @@ -1,6 +1,7 @@ Name: docker-ce Version: %{_version} Release: %{_release}%{?dist} +Epoch: %{getenv:EPOCH} Summary: The open-source application container engine Group: Tools/Docker License: ASL 2.0 diff --git a/components/packaging/rpm/fedora-28/docker-ce.spec b/components/packaging/rpm/fedora-28/docker-ce.spec index 337831fae5..cc13455dd1 100644 --- a/components/packaging/rpm/fedora-28/docker-ce.spec +++ b/components/packaging/rpm/fedora-28/docker-ce.spec @@ -1,6 +1,7 @@ Name: docker-ce Version: %{_version} Release: %{_release}%{?dist} +Epoch: %{getenv:EPOCH} Summary: The open-source application container engine Group: Tools/Docker License: ASL 2.0