docker_24: init at 24.0.5

[mikroskeem]

Description of changes

#223362

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• 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/)
• 23.05 Release Notes (or backporting 22.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.

[amaxine]

Thanks for looking into this. When I reviewed changes when 23 was first getting RCs, the primary thing that'll need fixing in the build process is documentation - everything else should apply to 20.x and 23.x.

[noisersup]

What's the state of this one and if there's anything that can help to kick this one forward?

[vito]

Thanks for working on this! Any chance we could jump ahead to v24.0.2 at this point? 😇 It has some features in its upgraded Buildkit dependency which I'd like to use (chiefly oci-layout:// support).

[mikroskeem]

What's the state of this one and if there's anything that can help to kick this one forward?

It's been stuck behind my time schedule and https://gist.github.com/mikroskeem/14c8f08ac8ad14e3f4f889f9d5a2b427

[vito]

I'm able to get this building with two small changes:

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 5f76710e21a..51b74bbdf12 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -176,7 +176,7 @@ rec {
     nativeBuildInputs = [
       makeWrapper pkg-config go-md2man go libtool installShellFiles
     ];
-    buildInputs = plugins;
+    buildInputs = [ glibc glibc.static ] ++ plugins;
 
     postPatch = ''
       patchShebangs man scripts/build/
@@ -280,7 +280,7 @@ rec {
     cliRev = "v${version}";
     cliHash = "sha256-Z8bj+TsQVhoQav7+0MQz9Iy4VJCuSX/Cm+sWytev2ns=";
     mobyRev = "v${version}";
-    mobyHash = "sha256-Z8bj+TsQVhoQav7+0MQz9Iy4VJCuSX/Cm+sWytev2ns=";
+    mobyHash = "sha256-AKS1x0zo+FRpx2HXyM7I+PiwEZj/jCWebd5LIjLw9zc=";
     runcRev = "v1.1.7";
     runcHash = "sha256-reSC9j9ESjRigItBRytef78XBjmMGsqu0o9qcN2AstU=";
     containerdRev = "v1.7.1";

Guessing the duped hash was just a typo, took a bit to figure out!

Without adding glibc, building fails like so - guessing this was only working due to some kind of impurity before:

Logs

error: builder for '/nix/store/sif28jpm25b1n6r2c8ynli6ngxlaxxk8-docker-24.0.2.drv' failed with exit code 1;
       last 10 log lines:
       > configuring
       > building
       > # github.com/docker/cli/cmd/docker
       > /nix/store/181ggl7y9szajk7hbj3drimkxw63ix1h-go-1.20.4/share/go/pkg/tool/linux_amd64/link: running gcc failed: exit status 1
       > /nix/store/shw0b6wv2xdvyj71b1fj147i83awrqfz-binutils-2.40/bin/ld: cannot find -lresolv: No such file or directory
       > /nix/store/shw0b6wv2xdvyj71b1fj147i83awrqfz-binutils-2.40/bin/ld: cannot find -lpthread: No such file or directory
       > /nix/store/shw0b6wv2xdvyj71b1fj147i83awrqfz-binutils-2.40/bin/ld: cannot find -ldl: No such file or directory
       > /nix/store/shw0b6wv2xdvyj71b1fj147i83awrqfz-binutils-2.40/bin/ld: cannot find -lc: No such file or directory
       > collect2: error: ld returned 1 exit status
       >
       For full logs, run 'nix log /nix/store/sif28jpm25b1n6r2c8ynli6ngxlaxxk8-docker-24.0.2.drv'.

---

I spent some time trying to get the man pages to build, but it's a bit of a pain. The man page generation code is in a separate ./man/ Go module with an empty go.mod that doesn't declare its dependencies. Instead the upstream repo expects you to run ./scripts/docs/generate-man.sh, which depends on the network.

I see a few options:

1. Just don't build man pages, which is a regression, but considering you can just use --help this seems to be the lesser evil to being stuck on Docker 20.
2. Statically commit generated man pages in this repo. Right now they're 17,424 lines of text in total. We'd have to make sure to re-generate these on every bump, and include man pages for each supported version.
3. Commit generated man pages to a separate, tagged repo. No more vendoring (yay!) but now there's another repo someone has to maintain (boo!).
4. Change things upstream.

Personally, my preference is 1 but I don't know if lack of man pages is a dealbreaker. When 4 happens we can always bring them back, and until then having them gone is pressure for someone (maybe even me) to fix it someday.

What do y'all think?

[Philipp-M]

I generally think going incremental is better than having a working PR open forever (don't let perfect be the enemy of good), so I would rather go with 1. I don't think it's really a deal breaker (since --help is always an option, and otherwise google).

We can create a follow-up PR to fix this (probably an issue before) or patch it upstream.

[mikroskeem]

I've opted in for 1. choice - let's get this update out.

[vdemeester]

@vito on 4. is there an upstream issue about this ? If I understood correctly (maybe not 😛), only the man generation part is a problem and require use to add glibc right ?

[mikroskeem]

only the man generation part is a problem and require use to add glibc right ?

No. If you try to remove it, you'll see linker complaining about missing -lc -lresolv etc.

[vdemeester]

LGTM 🐯

[marcofeltmann]

I ran into this issue docker/cli#4437 on unstable due to Go 1.20.6.
Since I require both for daily business (Go Services, Kubernetes, KinD) I'd really appreciate an upgrade.

[mikroskeem]

Waiting for someone with permissions to merge, or do additional review.

[amaxine]

Do you mind rebasing on latest master and bumping to 24.0.5? That contains fixes for go 1.20.6. I'll take a proper look after that.

[teutat3s]

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

21 packages built:

• apptainer
• apptainer-overriden-nixos
• apx
• charliecloud
• docker (docker_20_10)
• docker-client
• docker-client.man
• docker-gc
• docker.man (docker_20_10.man)
• docker_24_0
• fn-cli
• nvidia-docker
• pipework
• python310Packages.jupyter-repo2docker
• python310Packages.jupyter-repo2docker.dist
• python311Packages.jupyter-repo2docker
• python311Packages.jupyter-repo2docker.dist
• singularity
• singularity-overriden-nixos
• udocker
• udocker.dist

[amaxine]

Thank you, looks good, we can hopefully get man pages working again later. i think we probably want to call this docker_24 rather than docker_24_0 because semver. It's unlikely we'd want 24.0 and 24.1 packaged together.

[amaxine]

Thanks a bunch for doing the work on this, it's really appreciated @mikroskeem

[bobrik]

This doesn't work on aarch64-darwin:

• docker: move default from 20.10 to 24 #264461 (comment)