Skip to content

Commit

Permalink
deb, rpm: add /etc/docker directory
Browse files Browse the repository at this point in the history
Previous versions of the engine created this directory as a side-effect of the
(legacy) "key.json" file. With the removal of libtrust (and the key.json) file,
that directory is no longer created.

While the precence of this directory is not needed for the daemon to function,
users may expect it to be there, so it there should be no harm in creating it.

This patch adds a .dirs file to create the directory on installation for .deb;
https://www.debian.org/doc/manuals/maint-guide/dother.en.html#dirs

And adds a %dirs directive for .rpm packages:
http://ftp.rpm.org/max-rpm/s1-rpm-inside-files-list-directives.html#S3-RPM-INSIDE-DIR-DIRECTIVE

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 86f8d3c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
thaJeztah committed Feb 7, 2023
1 parent 732208e commit 11de7ef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions deb/common/docker-ce.dirs
@@ -0,0 +1 @@
/etc/docker
1 change: 1 addition & 0 deletions rpm/SPECS/docker-ce.spec
Expand Up @@ -102,6 +102,7 @@ install -D -m 0644 engine/contrib/init/systemd/docker.socket ${RPM_BUILD_ROOT}%{
%{_bindir}/docker-init
%{_unitdir}/docker.service
%{_unitdir}/docker.socket
%dir /etc/docker

%post
%systemd_post docker.service
Expand Down

0 comments on commit 11de7ef

Please sign in to comment.