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.

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

Jump to bottom

Docker 20.10 fixes #109447

Merged
merged 3 commits into from Jan 15, 2021
Merged

Docker 20.10 fixes #109447

merged 3 commits into from Jan 15, 2021

Conversation

mikroskeem
Copy link
Member

@mikroskeem mikroskeem commented Jan 15, 2021 •
edited

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@mikroskeem
Copy link
Member Author

nix build -Lf . nixosTests.docker ran successfully.

@ghost
Copy link

ghost commented Jan 15, 2021

Can I push a fix for the mkRemovedOptionModule message as well?

@mikroskeem
Copy link
Member Author

Sure.

nixos/docker: change misleading error message
4000091 
The socketActivation option was removed, but later on socket activation
was added back without the option to disable it. The description now reflects
that socket activation is used unconditionally in the current setup.
roberth
roberth approved these changes Jan 15, 2021
View reviewed changes
Copy link
Member

@roberth roberth left a comment

Choose a reason for hiding this comment

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

Looks good. Thanks for the quick response!

@roberth roberth merged commit 95e1ba3 into NixOS:master Jan 15, 2021
@exFalso
Copy link
Contributor

exFalso commented Feb 1, 2021

This does not work, I'm experiencing the socket issue (failed to load listeners: no sockets found via socket activation).
If I change fd:// to unix:// it works

@exFalso exFalso mentioned this pull request Feb 1, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roberth roberth roberth approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: documentation 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mikroskeem @exFalso @roberth