Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit c4c2d89

Browse files
thaJeztahthaJeztah
committed
Use systemd unit files from upstream repository
The packaging repository was maintaining its own version of the systemd units. These files were originally based on the units in the upstream docker / moby repository, but diverged. PR moby/moby#42373 merged back the units from this repository to upstream, so we can now consume those files instead of the ones that were maintained in this repository. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 6857538 commit c4c2d89

6 files changed

Lines changed: 9 additions & 85 deletions

File tree

‎deb/Makefile‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ $(DISTROS): sources
7777
$(CHOWN) -R $(shell id -u):$(shell id -g) "debbuild/$@"
7878

7979
.PHONY: sources
80-
sources: sources/cli.tgz sources/engine.tgz sources/scan-cli-plugin.tgz sources/docker.service sources/docker.socket sources/plugin-installers.tgz
80+
sources: sources/cli.tgz sources/engine.tgz sources/scan-cli-plugin.tgz sources/plugin-installers.tgz
8181

8282
sources/engine.tgz:
8383
mkdir -p $(@D)
@@ -103,14 +103,6 @@ sources/scan-cli-plugin.tgz:
103103
alpine \
104104
tar -C / -c -z -f /v/scan-cli-plugin.tgz --exclude .git scan-cli-plugin
105105

106-
sources/docker.service: ../systemd/docker.service
107-
mkdir -p $(@D)
108-
cp $< $@
109-
110-
sources/docker.socket: ../systemd/docker.socket
111-
mkdir -p $(@D)
112-
cp $< $@
113-
114106
sources/plugin-installers.tgz: $(wildcard ../plugins/*)
115107
docker run --rm -w /v \
116108
-v $(PLUGINS_DIR):/plugins \

‎deb/common/rules‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ override_dh_strip:
3838

3939
override_dh_auto_install:
4040
# docker-ce-cli install
41-
install -D -m 0644 /go/src/github.com/docker/cli/contrib/completion/fish/docker.fish debian/docker-ce-cli/usr/share/fish/vendor_completions.d/docker.fish
42-
install -D -m 0644 /go/src/github.com/docker/cli/contrib/completion/zsh/_docker debian/docker-ce-cli/usr/share/zsh/vendor-completions/_docker
43-
install -D -m 0755 /go/src/github.com/docker/cli/build/docker debian/docker-ce-cli/usr/bin/docker
41+
install -D -m 0644 cli/contrib/completion/fish/docker.fish debian/docker-ce-cli/usr/share/fish/vendor_completions.d/docker.fish
42+
install -D -m 0644 cli/contrib/completion/zsh/_docker debian/docker-ce-cli/usr/share/zsh/vendor-completions/_docker
43+
install -D -m 0755 cli/build/docker debian/docker-ce-cli/usr/bin/docker
4444
set -e;cd /sources && \
4545
tar xzf plugin-installers.tgz; \
4646
for installer in plugins/*.installer; do \
@@ -49,8 +49,8 @@ override_dh_auto_install:
4949
bash $${installer} install_plugin; \
5050
done
5151
# docker-ce install
52-
install -D -m 0644 /sources/docker.service debian/docker-ce/lib/systemd/system/docker.service
53-
install -D -m 0644 /sources/docker.socket debian/docker-ce/lib/systemd/system/docker.socket
52+
install -D -m 0644 engine/contrib/init/systemd/docker.service debian/docker-ce/lib/systemd/system/docker.service
53+
install -D -m 0644 engine/contrib/init/systemd/docker.socket debian/docker-ce/lib/systemd/system/docker.socket
5454
install -D -m 0755 $(shell readlink -e engine/bundles/dynbinary-daemon/dockerd) debian/docker-ce/usr/bin/dockerd
5555
install -D -m 0755 /usr/local/bin/docker-proxy debian/docker-ce/usr/bin/docker-proxy
5656
install -D -m 0755 /usr/local/bin/docker-init debian/docker-ce/usr/bin/docker-init

‎rpm/Makefile‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ centos: $(CENTOS_RELEASES) ## build all centos rpm packages
8484
rhel: $(RHEL_RELEASES) ## build all rhel rpm packages
8585

8686
.PHONY: $(DISTROS)
87-
$(DISTROS): rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz rpmbuild/SOURCES/scan-cli-plugin.tgz rpmbuild/SOURCES/docker.service rpmbuild/SOURCES/docker.socket rpmbuild/SOURCES/plugin-installers.tgz
87+
$(DISTROS): rpmbuild/SOURCES/engine.tgz rpmbuild/SOURCES/cli.tgz rpmbuild/SOURCES/scan-cli-plugin.tgz rpmbuild/SOURCES/plugin-installers.tgz
8888
@echo "== Building packages for $@ =="
8989
mkdir -p "rpmbuild/$@"
9090
$(BUILD)
@@ -115,14 +115,6 @@ rpmbuild/SOURCES/scan-cli-plugin.tgz:
115115
alpine \
116116
tar -C / -c -z -f /v/scan-cli-plugin.tgz --exclude .git scan-cli-plugin
117117

118-
rpmbuild/SOURCES/docker.service: ../systemd/docker.service
119-
mkdir -p $(@D)
120-
cp $< $@
121-
122-
rpmbuild/SOURCES/docker.socket: ../systemd/docker.socket
123-
mkdir -p $(@D)
124-
cp $< $@
125-
126118
rpmbuild/SOURCES/plugin-installers.tgz: $(wildcard ../plugins/*)
127119
docker run --rm -w /v \
128120
-v $(PLUGINS_DIR):/plugins \

‎rpm/SPECS/docker-ce.spec‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ Version: %{_version}
88
Release: %{_release}%{?dist}
99
Epoch: 3
1010
Source0: engine.tgz
11-
Source1: docker.service
12-
Source2: docker.socket
1311
Summary: The open-source application container engine
1412
Group: Tools/Docker
1513
License: ASL 2.0
@@ -101,8 +99,8 @@ install -D -p -m 0755 /usr/local/bin/docker-proxy ${RPM_BUILD_ROOT}%{_bindir}/do
10199
install -D -p -m 755 /usr/local/bin/docker-init ${RPM_BUILD_ROOT}%{_bindir}/docker-init
102100

103101
# install systemd scripts
104-
install -D -m 0644 ${RPM_SOURCE_DIR}/docker.service ${RPM_BUILD_ROOT}%{_unitdir}/docker.service
105-
install -D -m 0644 ${RPM_SOURCE_DIR}/docker.socket ${RPM_BUILD_ROOT}%{_unitdir}/docker.socket
102+
install -D -m 0644 engine/contrib/init/systemd/docker.service ${RPM_BUILD_ROOT}%{_unitdir}/docker.service
103+
install -D -m 0644 engine/contrib/init/systemd/docker.socket ${RPM_BUILD_ROOT}%{_unitdir}/docker.socket
106104

107105
%files
108106
%{_bindir}/dockerd

‎systemd/docker.service‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎systemd/docker.socket‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)