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_25: init at 25.0.3 #278607

Merged
merged 1 commit into from
Feb 26, 2024
Merged

docker_25: init at 25.0.3 #278607

merged 1 commit into from
Feb 26, 2024

Conversation

jmbaur
Copy link
Contributor

@jmbaur jmbaur commented Jan 4, 2024

Description of changes

Release notes:

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.

Add a 👍 reaction to pull requests you find important.

Copy link
Member

@emilylange emilylange left a comment

Choose a reason for hiding this comment

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

Cross posting #278531 (comment) because of the change to LimitNOFILE = 1048576; made in b854c8a.

@jmbaur
Copy link
Contributor Author

jmbaur commented Jan 14, 2024

Cross posting #278531 (comment) because of the change to LimitNOFILE = 1048576; made in b854c8a.

The reasoning in moby/moby#45534 (comment) sounds good to me in favor of using systemd's defaults. Removing the explicit setting of LimitNOFILE in this module.

@jmbaur jmbaur force-pushed the docker-25 branch 3 times, most recently from 268ffb1 to d87a5ad Compare January 22, 2024 03:18
@jmbaur jmbaur changed the title (WIP) docker_25: init at 25 docker_25: init at 25 Jan 22, 2024
@jmbaur jmbaur marked this pull request as ready for review January 22, 2024 03:19
@emilylange emilylange dismissed their stale review January 22, 2024 16:39

reason to block has been resolved :)

@emilylange
Copy link
Member

@infinisil is the failing pkgs/by-name check due to the inherit (callPackage pattern a false positive or intended?

I did not immediately spot documentation for that inherit pattern in the pkgs/by-name docs.
Though I might have missed something (on mobile rn).

@infinisil
Copy link
Member

@infinisil is the failing pkgs/by-name check due to the inherit (callPackage pattern a false positive or intended?

False positive, please ignore, master won't break from merging like this! Am working on a fix for this :)

@infinisil
Copy link
Member

Am working on a fix for this :)

Will be fixed with #285089

@jmbaur jmbaur force-pushed the docker-25 branch 2 times, most recently from b7e4d8d to b531ee6 Compare February 2, 2024 01:24
@ereslibre
Copy link
Member

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

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

@emilylange emilylange changed the title docker_25: init at 25 docker_25: init at 25.0.2 Feb 5, 2024
@infinisil
Copy link
Member

The PR to fix the pkgs/by-name check is now merged and used in CI, so it won't fail anymore the next time you push :)

@jmbaur
Copy link
Contributor Author

jmbaur commented Feb 9, 2024

Thanks @infinisil :)

Copy link
Contributor

@milas milas left a comment

Choose a reason for hiding this comment

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

Updated hashes for v25.0.3

disclaimer: I'm a Docker Inc employee but I'm not actually a Moby maintainer

pkgs/applications/virtualization/docker/default.nix Outdated Show resolved Hide resolved
@jmbaur jmbaur changed the title docker_25: init at 25.0.2 docker_25: init at 25.0.3 Feb 9, 2024
@amaxine amaxine removed their request for review February 11, 2024 11:03
@vdemeester vdemeester mentioned this pull request Feb 12, 2024
13 tasks
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐯

@bhavitsharma
Copy link

would love to see this PR merged! we're waiting on some new OCI compliant layer remote cache features.

@emilylange emilylange merged commit 4eb3a70 into NixOS:master Feb 26, 2024
26 of 27 checks passed
@jmbaur jmbaur deleted the docker-25 branch February 26, 2024 14:48
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

8 participants