From 85c6730591b0d5091e967a3676e9f6c7f30ade61 Mon Sep 17 00:00:00 2001 From: Jose Bigio Date: Tue, 28 Aug 2018 13:27:01 -0700 Subject: [PATCH 1/2] Bump the epoch from 2 to 3 for deb packages Signed-off-by: Jose Bigio Upstream-commit: 4f3c49bc920bd125aeeea546d48c561f317c4c37 Component: packaging --- components/packaging/deb/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index cf3a8bb705..8cfbbcd2bd 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?=2 +EPOCH?=3 COMMON_FILES=common BUILD?=docker build \ From cc5399a50dd1bd29b7eb805bfe8a1f3d34b25ced Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Tue, 28 Aug 2018 13:51:21 -0400 Subject: [PATCH 2/2] Add post-stop Signed-off-by: Michael Crosby (cherry picked from commit 5f4b9c0eab3978e491ff249aacffb2338bf2408a) Signed-off-by: Andrew Hsu Upstream-commit: 89d78463660094d24878c9060d7ef45dddc7546b Component: packaging --- components/packaging/systemd/docker.service | 1 + 1 file changed, 1 insertion(+) diff --git a/components/packaging/systemd/docker.service b/components/packaging/systemd/docker.service index 7d7c2624b2..23557a0089 100644 --- a/components/packaging/systemd/docker.service +++ b/components/packaging/systemd/docker.service @@ -9,6 +9,7 @@ Wants=network-online.target # Install containerd-shim-process if it's not already installed ExecStartPre=/usr/libexec/containerd-offline-installer /var/lib/containerd-offline-installer/containerd-shim-process.tar docker.io/docker/containerd-shim-process ExecStart=/usr/bin/dockerd +ExecStopPost=/usr/bin/dockerd post-stop TimeoutSec=0 RestartSec=2 Restart=always