From 30826380470c11f6e6cc6c6351ee32c346163eb6 Mon Sep 17 00:00:00 2001 From: Daniel Hiltgen Date: Mon, 10 Sep 2018 08:21:58 -0700 Subject: [PATCH] Bump packaging epoch This should accomodate the new versioning fix Signed-off-by: Daniel Hiltgen Upstream-commit: be00095e1d0d5674665a63b6e5932178632feb0e Component: packaging --- components/packaging/deb/Makefile | 2 +- components/packaging/rpm/SPECS/docker-ce-cli.spec | 2 +- components/packaging/rpm/SPECS/docker-ce.spec | 2 +- components/packaging/rpm/centos-7/docker-ce.spec | 2 +- components/packaging/rpm/fedora-27/docker-ce.spec | 2 +- components/packaging/rpm/fedora-28/docker-ce.spec | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index 8cfbbcd2bd..6013270c5f 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -11,7 +11,7 @@ GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION) SUFFIX=ce DEB_VERSION?=$(shell SUFFIX=$(SUFFIX) ./gen-deb-ver $(CLI_DIR) "$(VERSION)") CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown -EPOCH?=3 +EPOCH?=4 COMMON_FILES=common BUILD?=docker build \ diff --git a/components/packaging/rpm/SPECS/docker-ce-cli.spec b/components/packaging/rpm/SPECS/docker-ce-cli.spec index 0dea3d3ed2..883507c676 100644 --- a/components/packaging/rpm/SPECS/docker-ce-cli.spec +++ b/components/packaging/rpm/SPECS/docker-ce-cli.spec @@ -3,7 +3,7 @@ Name: docker-ce-cli Version: %{_version} Release: %{_release}%{?dist} -Epoch: 0 +Epoch: 1 Summary: The open-source application container engine Group: Tools/Docker License: ASL 2.0 diff --git a/components/packaging/rpm/SPECS/docker-ce.spec b/components/packaging/rpm/SPECS/docker-ce.spec index ea27c5aa82..5b9d049f42 100644 --- a/components/packaging/rpm/SPECS/docker-ce.spec +++ b/components/packaging/rpm/SPECS/docker-ce.spec @@ -3,7 +3,7 @@ Name: docker-ce Version: %{_version} Release: %{_release}%{?dist} -Epoch: 2 +Epoch: 3 Source0: containerd-proxy.tgz Source1: containerd-shim-process.tar Source2: docker.service diff --git a/components/packaging/rpm/centos-7/docker-ce.spec b/components/packaging/rpm/centos-7/docker-ce.spec index f20f7cb614..e9762f3be3 100644 --- a/components/packaging/rpm/centos-7/docker-ce.spec +++ b/components/packaging/rpm/centos-7/docker-ce.spec @@ -1,7 +1,7 @@ Name: docker-ce Version: %{_version} Release: %{_release}%{?dist} -Epoch: 2 +Epoch: 3 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 cc3f724fc4..712a4ca508 100644 --- a/components/packaging/rpm/fedora-27/docker-ce.spec +++ b/components/packaging/rpm/fedora-27/docker-ce.spec @@ -1,7 +1,7 @@ Name: docker-ce Version: %{_version} Release: %{_release}%{?dist} -Epoch: 2 +Epoch: 3 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 cc3f724fc4..712a4ca508 100644 --- a/components/packaging/rpm/fedora-28/docker-ce.spec +++ b/components/packaging/rpm/fedora-28/docker-ce.spec @@ -1,7 +1,7 @@ Name: docker-ce Version: %{_version} Release: %{_release}%{?dist} -Epoch: 2 +Epoch: 3 Summary: The open-source application container engine Group: Tools/Docker License: ASL 2.0