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

docker: 20.10.6 -> 20.10.7 #125946

Merged
merged 5 commits into from Jul 15, 2021
Merged

Conversation

mikroskeem
Copy link
Member

Motivation for this change

Minor update for Docker. See Docker release notes

Also enables buildx support by default; That change is up to discussion - buildx is available on Docker Desktop (MacOS), Ubuntu and Arch Linux out of the box, but not on NixOS. I don't see a reason why it shouldn't be enabled here.

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/)
  • 21.11 Release Notes
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@mikroskeem
Copy link
Member Author

mikroskeem commented Jun 6, 2021

Result of nixpkgs-review pr 125946 run on x86_64-linux 1

1 test built:
  • nixosTests.docker

@r-rmcgibbo
Copy link

r-rmcgibbo commented Jun 6, 2021

Result of nixpkgs-review pr 125946 at 327b3ffd run on aarch64-linux 1

11 packages built successfully:
  • charliecloud
  • docker (docker-edge ,docker_20_10)
  • docker-client
  • docker-gc
  • fn-cli
  • grype
  • nixos-install-tools
  • out-of-tree
  • pipework
  • python38Packages.jupyter-repo2docker
  • python39Packages.jupyter-repo2docker

Result of nixpkgs-review pr 125946 at 327b3ffd run on x86_64-linux 1

12 packages built successfully:
  • charliecloud
  • docker (docker-edge ,docker_20_10)
  • docker-client
  • docker-gc
  • fn-cli
  • grype
  • nixos-install-tools
  • nvidia-docker
  • out-of-tree
  • pipework
  • python38Packages.jupyter-repo2docker
  • python39Packages.jupyter-repo2docker
2 suggestions:
  • warning: missing-phase-hooks

    installPhase should probably contain runHook preInstall and runHook postInstall.

    Near pkgs/development/go-packages/generic/default.nix:219:5:

        |
    219 |     installPhase = args.installPhase or ''
        |     ^
    
  • warning: missing-phase-hooks

    buildPhase should probably contain runHook preBuild.

    Near pkgs/development/go-packages/generic/default.nix:141:5:

        |
    141 |     buildPhase = args.buildPhase or ''
        |     ^
    

@periklis periklis removed their request for review June 7, 2021 14:00
@mikroskeem
Copy link
Member Author

@periklis are you simply trying to opt-out from this PR (as well), or generally not interested in maintaining the Docker derivation?

@ofborg ofborg bot requested a review from periklis June 15, 2021 10:23
Copy link
Contributor

@amaxine amaxine left a comment

Choose a reason for hiding this comment

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

Docker still works so 👍 from me :)

I don't have any comments on the nix related changes, and see no reason to oppose enabling buildx support by default.

@mikroskeem
Copy link
Member Author

@periklis since you don't seem to have interest in reviewing this, would you like me to remove you from the maintainers list?

Copy link
Member

@endocrimes endocrimes left a comment

Choose a reason for hiding this comment

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

Big 👍 on enabling buildx by default - I actually just ran into this again when doing a k8s docker build.

Also version diff lgtm

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/388

@github-actions
Copy link
Contributor

Successfully created backport PR #131456 for release-21.05.

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.

None yet

7 participants