starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-11-06 21:18:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add socket activation for RHEL based distributions

Browse Source 
Removes the systemd drop-in unit file for socket activation and instead
prefers socket activation by default for both RHEL based and DEBIAN
based distributions.

Socket activation for RHEL based distributions was tested on CentOS 7 and Fedora 28.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 91c85cd38197b9d92d5b3e8a1b577d3178d73fcc)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 6a7e302c260a2ff7e4d8b7a6d01249a09c140618
Component: packaging
This commit is contained in:
Eli Uriegas
2018-11-30 19:43:29 +00:00
parent b766ec9947
commit 8293f65feb
6 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/packaging/deb/Makefile
+1 -5
View File
@@ -32,7 +32,7 @@ RUN=docker run --rm -i \
-v $(CURDIR)/debbuild/$@:/build \
debbuild-$@/$(ARCH)
SOURCE_FILES=engine-image cli.tgz docker.service docker.socket 00-socket-activation.conf distribution_based_engine.json
SOURCE_FILES=engine-image cli.tgz docker.service docker.socket distribution_based_engine.json
SOURCES=$(addprefix sources/, $(SOURCE_FILES))
.PHONY: help
@@ -121,10 +121,6 @@ sources/docker.socket: ../systemd/docker.socket
mkdir -p $(@D)
cp $< $@
sources/00-socket-activation.conf: ../systemd/00-socket-activation.conf
mkdir -p $(@D)
cp $< $@
sources/distribution_based_engine.json: sources/engine-image
mkdir -p $(@D)
docker inspect "$(shell cat $<)" \
components/packaging/deb/common/rules
-1
View File
@@ -22,7 +22,6 @@ override_dh_auto_install:
# docker-ce install
install -D -m 0644 /sources/docker.service debian/docker-ce/lib/systemd/system/docker.service
install -D -m 0644 /sources/docker.socket debian/docker-ce/lib/systemd/system/docker.socket
install -D -m 0644 /sources/00-socket-activation.conf debian/docker-ce/lib/systemd/system/docker.service.d/00-socket-activation.conf
install -D -m 0755 /source/dockerd debian/docker-ce/usr/bin/dockerd-ce
install -D -m 0755 /source/docker-proxy debian/docker-ce/usr/bin/docker-proxy
install -D -m 0755 /source/docker-init debian/docker-ce/usr/bin/docker-init