From 1037ee0af43313bb0c6bb8446061eed72cb94fef Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Tue, 6 Jun 2017 14:56:39 -0700 Subject: [PATCH] Use internal systemd scripts for DEB packaging Signed-off-by: Eli Uriegas Upstream-commit: 477d0b1f735f7e243425cd2c5f48e8f216556c2f Component: packaging --- components/packaging/deb/Makefile | 7 +++++++ components/packaging/deb/common/docker-ce.install | 4 ++-- components/packaging/{ => deb}/systemd/docker.service | 0 components/packaging/{ => deb}/systemd/docker.socket | 0 4 files changed, 9 insertions(+), 2 deletions(-) rename components/packaging/{ => deb}/systemd/docker.service (100%) rename components/packaging/{ => deb}/systemd/docker.socket (100%) diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index 5ca2b57f62..7c0adf4604 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -31,6 +31,7 @@ ubuntu-xenial: ## build ubuntu xenial deb packages -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ -v $(CLI_DIR):/cli \ + -v $(CURDIR)/systemd:/root/build-deb/systemd \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ @@ -42,6 +43,7 @@ ubuntu-trusty: ## build ubuntu trusty deb packages -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ -v $(CLI_DIR):/cli \ + -v $(CURDIR)/systemd:/root/build-deb/systemd \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ @@ -53,6 +55,7 @@ ubuntu-yakkety: ## build ubuntu yakkety deb packages -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ -v $(CLI_DIR):/cli \ + -v $(CURDIR)/systemd:/root/build-deb/systemd \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ @@ -64,6 +67,7 @@ ubuntu-zesty: ## build ubuntu zesty deb packages -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ -v $(CLI_DIR):/cli \ + -v $(CURDIR)/systemd:/root/build-deb/systemd \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ @@ -75,6 +79,7 @@ debian-jessie: ## build debian jessie deb packages -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ -v $(CLI_DIR):/cli \ + -v $(CURDIR)/systemd:/root/build-deb/systemd \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ @@ -86,6 +91,7 @@ debian-stretch: ## build debian stretch deb packages -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ -v $(CLI_DIR):/cli \ + -v $(CURDIR)/systemd:/root/build-deb/systemd \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ @@ -97,5 +103,6 @@ debian-wheezy: ## build debian wheezy deb packages -v $(CURDIR)/debbuild/$@:/build \ -v $(ENGINE_DIR):/engine \ -v $(CLI_DIR):/cli \ + -v $(CURDIR)/systemd:/root/build-deb/systemd \ debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ diff --git a/components/packaging/deb/common/docker-ce.install b/components/packaging/deb/common/docker-ce.install index baa8cac2dc..90d0b29179 100644 --- a/components/packaging/deb/common/docker-ce.install +++ b/components/packaging/deb/common/docker-ce.install @@ -5,8 +5,8 @@ engine/contrib/*-integration usr/share/docker-ce/contrib/ engine/contrib/check-config.sh usr/share/docker-ce/contrib/ engine/contrib/completion/fish/docker.fish usr/share/fish/vendor_completions.d/ engine/contrib/completion/zsh/_docker usr/share/zsh/vendor-completions/ -engine/contrib/init/systemd/docker.service lib/systemd/system/ -engine/contrib/init/systemd/docker.socket lib/systemd/system/ +systemd/docker.service lib/systemd/system/ +systemd/docker.socket lib/systemd/system/ engine/contrib/mk* usr/share/docker-ce/contrib/ engine/contrib/nuke-graph-directory.sh usr/share/docker-ce/contrib/ engine/contrib/syntax/nano/Dockerfile.nanorc usr/share/nano/ diff --git a/components/packaging/systemd/docker.service b/components/packaging/deb/systemd/docker.service similarity index 100% rename from components/packaging/systemd/docker.service rename to components/packaging/deb/systemd/docker.service diff --git a/components/packaging/systemd/docker.socket b/components/packaging/deb/systemd/docker.socket similarity index 100% rename from components/packaging/systemd/docker.socket rename to components/packaging/deb/systemd/docker.socket