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

Move Docker configuration to daemon.json #2116

Merged
merged 1 commit into from
Sep 7, 2022

Conversation

agners
Copy link
Member

@agners agners commented Sep 6, 2022

This is more readable than passing arguments to the daemon directly. It also shortens the ExecStart command significantly, which is stored in every log entry in systemd-journald.

This is more readable than passing arguments to the daemon directly. It
also shortens the ExecStart command significantly, which is stored in
every log entry in systemd-journald.
@pvizeli
Copy link
Member

pvizeli commented Sep 7, 2022

should we cleanup the overlay on the OTA?

@agners
Copy link
Member Author

agners commented Sep 7, 2022

should we cleanup the overlay on the OTA?

We still need the key.json, it is now just explicitly referenced (see "deprecated-key-path"). I was wondering if the key file is still necessary (since it is saying "deprecated"), but it seems that current Docker still requires it.

@pvizeli
Copy link
Member

pvizeli commented Sep 7, 2022

Without bind mount, I think new installation or reseted overlay will not have that folder on the overlay. So maybe /mnt/data/docker/key.json is better?

@agners
Copy link
Member Author

agners commented Sep 7, 2022

Without bind mount, I think new installation or reseted overlay will not have that folder on the overlay.

Right, but in tests it seems that the Docker daemon automatically creates the directory.

So maybe /mnt/data/docker/key.json is better?

We would need to migrate from the overlay location. I know that its not nice that we point into the overlay directly, but it seems the simplest solution. The key file will become unnecessary in the future:

moby/moby#43555
moby/moby#41295

@agners agners merged commit 66c15ad into home-assistant:dev Sep 7, 2022
@agners agners added the REL-9 label Sep 8, 2022
agners added a commit to agners/operating-system that referenced this pull request Sep 8, 2022
This is more readable than passing arguments to the daemon directly. It
also shortens the ExecStart command significantly, which is stored in
every log entry in systemd-journald.
@agners agners deleted the docker-config-in-daemon-json branch September 8, 2022 14:20
agners added a commit to agners/operating-system that referenced this pull request Sep 12, 2022
Since /etc/docker does not get bind mounted anymore (see home-assistant#2116),
key.json from the overlay partition is used directly.
agners added a commit that referenced this pull request Sep 12, 2022
* Fix Docker key.json corruption check

Since /etc/docker does not get bind mounted anymore (see #2116),
key.json from the overlay partition is used directly.

* Use -e flag for jq to get useful exit code
agners added a commit that referenced this pull request Sep 13, 2022
* Fix Docker key.json corruption check

Since /etc/docker does not get bind mounted anymore (see #2116),
key.json from the overlay partition is used directly.

* Use -e flag for jq to get useful exit code
@HangrilyJon
Copy link

Are end users able to get write access or the ability to override/supersede the default settings provided in this file? A (admittedly small) users have already commented on #2135 who need this ability, mostly to set their own default base network.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants