Skip to content
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.

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

[23.0 backport] deb, rpm: add /etc/docker directory #842

Merged
merged 1 commit into from Feb 7, 2023

Conversation

thaJeztah
Copy link
Member

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

rumpl
rumpl previously approved these changes Feb 7, 2023
Copy link
Member

@rumpl rumpl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

neersighted
neersighted previously approved these changes Feb 7, 2023
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.

For scripting purposes, users are still recommended to check if the directory
exists or to create it (mkdir -p).

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 bfab8ec)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah dismissed stale reviews from neersighted and rumpl via 3d09b7c February 7, 2023 22:16
@thaJeztah
Copy link
Member Author

green here as well 🎉

@thaJeztah thaJeztah merged commit 6801937 into docker:23.0 Feb 7, 2023
@thaJeztah thaJeztah deleted the 23.0_backport_add_etc_docker branch February 7, 2023 22:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants