Skip to content

docker-engine: use systemd units conf from sources #283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
crazy-max merged 2 commits into from
Oct 7, 2025
Merged

docker-engine: use systemd units conf from sources #283

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8b982c
docker-engine: use systemd units conf from sources
crazy-max Oct 6, 2025
63c103a
docker-engine: verify systemd units
crazy-max Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions pkg/docker-engine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ RUN --mount=type=bind,source=scripts/pkg-deb-build.sh,target=/usr/local/bin/pkg-
--mount=type=bind,from=scripts,source=gen-ver.sh,target=/usr/local/bin/gen-ver \
--mount=type=bind,from=scripts,source=gen-deb-changelog.sh,target=/usr/local/bin/gen-deb-changelog \
--mount=type=bind,from=scripts,source=fix-cc.sh,target=/usr/local/bin/fix-cc \
--mount=source=common,target=/common \
--mount=type=bind,from=src,source=/src,target=/root/package/engine,rw \
--mount=type=bind,from=go,source=/usr/local/go,target=/usr/local/go \
OUTDIR=/out SRCDIR=/root/package/engine pkg-deb-build
Expand Down Expand Up @@ -173,8 +172,6 @@ RUN --mount=type=bind,source=scripts/pkg-rpm-build.sh,target=/usr/local/bin/pkg-
--mount=type=bind,source=scripts/check-gomod.sh,target=/usr/local/bin/check-gomod \
--mount=type=bind,from=scripts,source=gen-ver.sh,target=/usr/local/bin/gen-ver \
--mount=type=bind,from=scripts,source=fix-cc.sh,target=/usr/local/bin/fix-cc \
--mount=type=bind,source=common/systemd/docker.service,target=/root/rpmbuild/SOURCES/docker.service \
--mount=type=bind,source=common/systemd/docker.socket,target=/root/rpmbuild/SOURCES/docker.socket \
--mount=type=bind,from=src-tgz,source=/out/engine.tgz,target=/root/rpmbuild/SOURCES/engine.tgz \
--mount=type=bind,from=src,source=/src,target=/usr/local/src/engine \
--mount=type=bind,from=go,source=/usr/local/go,target=/usr/local/go \
Expand Down
47 changes: 0 additions & 47 deletions pkg/docker-engine/common/systemd/docker.service
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions pkg/docker-engine/common/systemd/docker.socket
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions pkg/docker-engine/deb/docker-ce.docker.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../engine/contrib/init/systemd/docker.service
1 change: 1 addition & 0 deletions pkg/docker-engine/deb/docker-ce.docker.socket
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../engine/contrib/init/systemd/docker.socket
2 changes: 0 additions & 2 deletions pkg/docker-engine/deb/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ override_dh_dwz:
@# https://packages.ubuntu.com/debhelper

override_dh_auto_install:
install -D -p -m 0644 /common/systemd/docker.service debian/docker-ce/lib/systemd/system/docker.service
install -D -p -m 0644 /common/systemd/docker.socket debian/docker-ce/lib/systemd/system/docker.socket
install -D -p -m 0755 $(shell readlink -e engine/bundles/dynbinary-daemon/dockerd) debian/docker-ce/usr/bin/dockerd
install -D -p -m 0755 $(shell readlink -e engine/bundles/dynbinary-daemon/docker-proxy) debian/docker-ce/usr/bin/docker-proxy
install -D -p -m 0755 /usr/local/bin/docker-init debian/docker-ce/usr/libexec/docker/docker-init
Expand Down
2 changes: 0 additions & 2 deletions pkg/docker-engine/rpm/docker-ce.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ Version: %{_version}
Release: %{_release}%{?dist}
Epoch: 3
Source0: engine.tgz
Source1: docker.service
Source2: docker.socket
Summary: The open-source application container engine
Group: Tools/Docker
License: Apache-2.0
Expand Down