Skip to content

docker 24.0.5 → 25.0.3#288018

Closed
aikooo7 wants to merge 1 commit intoNixOS:masterfrom
aikooo7:bump-docker
Closed

docker 24.0.5 → 25.0.3#288018
aikooo7 wants to merge 1 commit intoNixOS:masterfrom
aikooo7:bump-docker

Conversation

@aikooo7
Copy link
Contributor

@aikooo7 aikooo7 commented Feb 11, 2024 •
edited
Loading

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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.

Closes #288001

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package labels Feb 11, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Feb 11, 2024
@gepbird
Copy link
Contributor

gepbird commented Feb 11, 2024

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

2 packages marked as broken and skipped:
  • python312Packages.jupyter-repo2docker
  • python312Packages.jupyter-repo2docker.dist
18 packages built:
  • airlift
  • airlift.dist
  • apptainer
  • apptainer-overriden-nixos
  • charliecloud
  • docker (docker_25)
  • docker-client
  • docker-gc
  • docker-sbom
  • fn-cli
  • nvidia-docker
  • pipework
  • python311Packages.jupyter-repo2docker
  • python311Packages.jupyter-repo2docker.dist
  • singularity
  • singularity-overriden-nixos
  • udocker
  • udocker.dist

@aikooo7
Copy link
Contributor Author

aikooo7 commented Feb 11, 2024

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

2 packages marked as broken and skipped:
  • python312Packages.jupyter-repo2docker
  • python312Packages.jupyter-repo2docker.dist
18 packages built:
  • airlift
  • airlift.dist
  • apptainer
  • apptainer-overriden-nixos
  • charliecloud
  • docker (docker_25)
  • docker-client
  • docker-gc
  • docker-sbom
  • fn-cli
  • nvidia-docker
  • pipework
  • python311Packages.jupyter-repo2docker
  • python311Packages.jupyter-repo2docker.dist
  • singularity
  • singularity-overriden-nixos
  • udocker
  • udocker.dist

Both python312Packages.jupyter-repo2docker and python312Packages.jupyter-repo2docker.dist are broken (in machine) even when trying to build based on master branch, so it is not broken because of my changes?

@vdemeester
Copy link
Member

vdemeester commented Feb 12, 2024

Note that there is #278607 that has been opened earlier this year.

@aikooo7
Copy link
Contributor Author

aikooo7 commented Feb 12, 2024 •
edited
Loading

Note that there is #278607 that has been opened earlier this year.

I should close this pr then?

@vdemeester
Copy link
Member

vdemeester commented Feb 12, 2024

Not entirely sure, but I would think so. It depends if we want to keep docker_24 or not. I think we should keep it (hence closing this PR), but let's see what other thinks.

@offline @periklis @amaxine

drupol
drupol reviewed Feb 15, 2024
View reviewed changes
pkgs/applications/virtualization/docker/default.nix
docker_25 = callPackage dockerGen rec {
version = "25.0.3";
cliRev = "v${version}";
cliHash = "sha256-u1quVGTx/p8BDyRn33vYyyuE5BOhWMnGQ5uVX0PZ5mg=";
Copy link
Contributor

@drupol drupol Feb 15, 2024

Choose a reason for hiding this comment

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

No hash update ?!

Copy link
Contributor Author

@aikooo7 aikooo7 Feb 15, 2024

Choose a reason for hiding this comment

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

It also seemed wrong, but the version did change when doing docker --version and it built successfully

Copy link
Member

@vdemeester vdemeester Feb 16, 2024

Choose a reason for hiding this comment

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

@aikooo7 yeah because the version is set by the build itself. If you change a random character from the hashes and re-run the build, you'll see a failure (and the new hashes as well).

@emilylange
Copy link
Member

emilylange commented Feb 26, 2024

Closing in favor of the now merged #278607

@emilylange emilylange closed this Feb 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@drupol drupol drupol left review comments

@vdemeester vdemeester Awaiting requested review from vdemeester

@offlinehacker offlinehacker Awaiting requested review from offlinehacker

@periklis periklis Awaiting requested review from periklis

Assignees

No one assigned

Labels

8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Update request: docker 24.0.5 → 25.0.3

5 participants

@aikooo7 @gepbird @vdemeester @emilylange @drupol