docker-engine: use systemd units conf from sources #283
Conversation
crazy-max
force-pushed
the
fix-docker-engine-systemd
branch
from
8a490d0 to
125cd63
Compare
|
build failure not related, see #284 |
pkg/docker-engine/deb/rules
Outdated
| 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 0644 engine/contrib/init/systemd/docker.service debian/docker-ce/lib/systemd/system/docker.service | ||
| install -D -p -m 0644 engine/contrib/init/systemd/docker.socket debian/docker-ce/lib/systemd/system/docker.socket |
There was a problem hiding this comment.
ISTR that in docker-ce-packaging we changed the way to install these to be the more idiomatic way, which uses a dangling symlink in the deb/common directory, which gets satisfied by the source code; I think this was the commit doing so; docker/docker-ce-packaging@5c01d5b
And this PR;
There may be other similar changes (but we'd have to check for those); the TL;DR is that we were doing various things manually, which was not the "normal" way of doing things; it works, but basically with some of these overrides we were going against the stream of what the deb packages would normally expect.
crazy-max
force-pushed
the
fix-docker-engine-systemd
branch
from
125cd63 to
696d124
Compare
pkg/docker-engine/Dockerfile
Outdated
| --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/contrib/init/systemd/docker.service,target=/root/rpmbuild/SOURCES/docker.service \ | ||
| --mount=type=bind,from=src,source=/src/contrib/init/systemd/docker.socket,target=/root/rpmbuild/SOURCES/docker.socket \ |
There was a problem hiding this comment.
Wondering if it's already extracting engine.tgz so if the files are already present ... somewhere and .. maybe not needed to be mounted separately, but if this works, we can look at that in a follow-up I guess 😅
Signed-off-by: CrazyMax <[email protected]>
crazy-max
force-pushed
the
fix-docker-engine-systemd
branch
from
696d124 to
d8b982c
Compare
thaJeztah
left a comment
thaJeztah
left a comment
There was a problem hiding this comment.
LGTM
... based on CI being green 😂 - I assume it verifies the files are there somehow?
Signed-off-by: CrazyMax <[email protected]>
Pushed extra commit to validate systemd unit is there (md5sums) and taken into account (postinst). |
3 participants
No description provided.