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

docker: Ensure references to go are removed from docker-containerd #41849

Merged
merged 1 commit into from Jun 11, 2018
Merged

docker: Ensure references to go are removed from docker-containerd #41849

merged 1 commit into from Jun 11, 2018

Conversation

srhb
Copy link
Contributor

@srhb srhb commented Jun 11, 2018 •
edited

Motivation for this change

Docker and containerd could use different versions of go, so the references were not properly removed since the store paths differed.

See also #41435
Fixes #41152

Needs backport.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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.

@srhb srhb added the 9.needs: port to stable A PR needs a backport to the stable release. label Jun 11, 2018
@srhb
Copy link
Contributor Author

srhb commented Jun 11, 2018

@GrahamcOfBorg test docker-tools docker

@GrahamcOfBorg
Copy link

Success on aarch64-linux

Attempted: tests.docker-tools, tests.docker

No partial log is available.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.docker-tools, tests.docker

Partial log (click to expand)

syncing
docker: running command: sync
docker: exit status 0
test script finished in 88.77s
cleaning up
killing docker (pid 593)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/gri1863dnarc64rr94r64v3p8jsc66pj-vm-test-run-docker-tools
/nix/store/knswpsmw0ip5wzip2qsvcqm3hm1r9nx9-vm-test-run-docker

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: docker

Partial log (click to expand)

/nix/store/rvz4v5fr95v1m5nbnpvccz81r3v33dmy-docker-18.03.1-ce

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: docker

Partial log (click to expand)

these paths will be fetched (6.64 MiB download, 36.31 MiB unpacked):
  /nix/store/cl6n8hc8cq50308lzfa7z3q39ih7a0az-docker-18.03.1-ce
copying path '/nix/store/cl6n8hc8cq50308lzfa7z3q39ih7a0az-docker-18.03.1-ce' from 'https://cache.nixos.org'...
/nix/store/cl6n8hc8cq50308lzfa7z3q39ih7a0az-docker-18.03.1-ce

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: docker

Partial log (click to expand)

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

@xeji xeji merged commit c80e0fb into NixOS:master Jun 11, 2018
xeji pushed a commit that referenced this pull request Jun 11, 2018
@srhb @xeji
docker: Ensure references to go are removed from docker-containerd (#…
44358ff 
…41849)

(cherry picked from commit c80e0fb)
@xeji
Copy link
Contributor

xeji commented Jun 11, 2018

backported in 44358ff

@Anton-Latukha Anton-Latukha mentioned this pull request Jun 11, 2018
Closed
10 tasks
@samueldr samueldr removed the 9.needs: port to stable A PR needs a backport to the stable release. label Apr 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
8.has: documentation 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

docker has go in its closure, causing a huge closure size increase
4 participants
@srhb @GrahamcOfBorg @xeji @samueldr