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

dockerTools: Pin go to 1.9 #35539

Merged
merged 2 commits into from Feb 26, 2018
Merged

dockerTools: Pin go to 1.9 #35539

merged 2 commits into from Feb 26, 2018

Conversation

srhb
Copy link
Contributor

@srhb srhb commented Feb 25, 2018 •
edited

Motivation for this change

This is the Go version that Docker currently uses, so I think this is an acceptable way to fix #35505 until the upstream tarsum takes Go 1.10 into account.

Things done

Go pinned at 1.9 for dockerTools

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Mic92
Mic92 reviewed Feb 25, 2018
View reviewed changes
pkgs/top-level/all-packages.nix Outdated
@@ -121,7 +121,7 @@ with pkgs;

dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh;

dockerTools = callPackage ../build-support/docker { };
dockerTools = callPackage ../build-support/docker { go = go_1_9; };
Copy link
Member

@Mic92 Mic92 Feb 25, 2018 •
edited

Choose a reason for hiding this comment

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

Can you also downgrade docker's go version and add this link as reference to both? moby/moby#35739

@srhb
Copy link
Contributor Author

srhb commented Feb 25, 2018

@Mic92 Good point. How does that look? :)

@srhb
dockerTools: Pin go to 1.9
be5090f 
This is the Go version that Docker currently uses:
moby/moby#35739

Fixes NixOS#35505
@srhb
docker: pin go to 1.9
d61a632 
This is the version used upstream, see:
moby/moby#35739
@srhb
Copy link
Contributor Author

srhb commented Feb 25, 2018

@GrahamcOfBorg test docker

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)

2018/02/25 17:30:34 WARN: man/src/trust/view.md does not exist, skipping
2018/02/25 17:30:34 WARN: man/src/trust.md does not exist, skipping
2018/02/25 17:30:34 WARN: man/src/volume/prune.md does not exist, skipping
2018/02/25 17:30:34 WARN: man/src/volume/rm.md does not exist, skipping
Generate legacy manpages
post-installation fixup
patching script interpreter paths in /nix/store/s0l0r9300w8fvnjpn7dp7mcrsq3r8kjf-docker-17.12.0-ce
gzipping man pages under /nix/store/by47r4wdrlgilsq61j8dhz6qlz4apllp-docker-17.12.0-ce-man/share/man/
patching script interpreter paths in /nix/store/by47r4wdrlgilsq61j8dhz6qlz4apllp-docker-17.12.0-ce-man
/nix/store/s0l0r9300w8fvnjpn7dp7mcrsq3r8kjf-docker-17.12.0-ce

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Partial log (click to expand)

shrinking RPATHs of ELF executables and libraries in /nix/store/j5nj3rs610f8r8cbpa1jv5zls945m8rm-docker-17.12.0-ce
shrinking /nix/store/j5nj3rs610f8r8cbpa1jv5zls945m8rm-docker-17.12.0-ce/libexec/docker/docker
shrinking /nix/store/j5nj3rs610f8r8cbpa1jv5zls945m8rm-docker-17.12.0-ce/libexec/docker/dockerd
patching script interpreter paths in /nix/store/j5nj3rs610f8r8cbpa1jv5zls945m8rm-docker-17.12.0-ce
checking for references to /build in /nix/store/j5nj3rs610f8r8cbpa1jv5zls945m8rm-docker-17.12.0-ce...
shrinking RPATHs of ELF executables and libraries in /nix/store/mgl18fw8y425lvb9aj3axc5fv2cqm988-docker-17.12.0-ce-man
gzipping man pages under /nix/store/mgl18fw8y425lvb9aj3axc5fv2cqm988-docker-17.12.0-ce-man/share/man/
patching script interpreter paths in /nix/store/mgl18fw8y425lvb9aj3axc5fv2cqm988-docker-17.12.0-ce-man
checking for references to /build in /nix/store/mgl18fw8y425lvb9aj3axc5fv2cqm988-docker-17.12.0-ce-man...
/nix/store/j5nj3rs610f8r8cbpa1jv5zls945m8rm-docker-17.12.0-ce

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Partial log (click to expand)

cannot build derivation ‘/nix/store/lvzndaim8rpi7yj5mdxy8h41fnxp6vqa-etc.drv’: 1 dependencies couldn't be built
cannot build derivation ‘/nix/store/mba3mnc9ma5xaxgqsglvrkynralkzbvh-stage-1-init.sh.drv’: 1 dependencies couldn't be built
cannot build derivation ‘/nix/store/30nmr2r0dwkrh2h3bavs3w5wy3frf3rj-initrd.drv’: 1 dependencies couldn't be built
cannot build derivation ‘/nix/store/rfqffk0yjp6r50vn54qrs11wa142ml54-nixos-system-docker-18.03.git.2e82275.drv’: 5 dependencies couldn't be built
cannot build derivation ‘/nix/store/wdqy5iwl4ynv7b1p7b384kan49cplpn0-closure-info.drv’: 1 dependencies couldn't be built
cannot build derivation ‘/nix/store/38p1c16lks2n5b82fn4wfr90q3hgd44k-run-nixos-vm.drv’: 2 dependencies couldn't be built
cannot build derivation ‘/nix/store/h62wv68lmfl0hcqhac3c7pfv676960ab-nixos-vm.drv’: 2 dependencies couldn't be built
cannot build derivation ‘/nix/store/ki544y3jngfacicijmnlpz1ls01ylm3a-nixos-test-driver-docker.drv’: 1 dependencies couldn't be built
cannot build derivation ‘/nix/store/wxwgrf248qknhw30g05yjwlszjbg6zbk-vm-test-run-docker.drv’: 1 dependencies couldn't be built
error: build of ‘/nix/store/wxwgrf248qknhw30g05yjwlszjbg6zbk-vm-test-run-docker.drv’ failed

@srhb
Copy link
Contributor Author

srhb commented Feb 25, 2018

Error is unrelated. x86_64 test runs fine locally.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

/nix/store/83jvxj8r3qkmi3fkfnzvfvyp66n6k10l-docker-17.12.0-ce

@Mic92
Copy link
Member

Mic92 commented Feb 26, 2018

That fixed all the docker tests, thanks.

@Mic92 Mic92 merged commit 02ba80a into NixOS:master Feb 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

nixos/tests: broken for docker-tools and kubernetes
3 participants
@srhb @GrahamcOfBorg @Mic92