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

skopeo: 0.1.29 -> 0.1.30 #41014

Merged
merged 1 commit into from May 24, 2018
Merged

skopeo: 0.1.29 -> 0.1.30 #41014

merged 1 commit into from May 24, 2018

Conversation

nlewo
Copy link
Member

@nlewo nlewo commented May 24, 2018

Skopeo used by our docker tools was patched to work in the build
sandbox (it used /var/tmp which is not available in the sandbox).
Since this temporary directory can now be set at build time, we remove
the patch from our docker tools.

Motivation for this change
Things done
  • 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.

Skopeo used by our docker tools was patched to work in the build
sandbox (it used /var/tmp which is not available in the sandbox).
Since this temporary directory can now be set at build time, we remove
the patch from our docker tools.
@nlewo
Copy link
Member Author

nlewo commented May 24, 2018

@GrahamcOfBorg test docker-tools

@GrahamcOfBorg
Copy link

Success on aarch64-linux

Attempted: tests.docker-tools

No partial log is available.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.docker-tools

Partial log (click to expand)

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

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: skopeo

Partial log (click to expand)

/nix/store/00pdw4xa1i1wzz5j1arkw20qzf9gpb5j-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/btrfs_tag.sh: interpreter directive changed from "/bin/bash" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash"
/nix/store/00pdw4xa1i1wzz5j1arkw20qzf9gpb5j-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/libdm_tag.sh: interpreter directive changed from "/bin/bash" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash"
/nix/store/00pdw4xa1i1wzz5j1arkw20qzf9gpb5j-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-gofmt: interpreter directive changed from "/bin/bash" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash"
/nix/store/00pdw4xa1i1wzz5j1arkw20qzf9gpb5j-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/make/test-integration: interpreter directive changed from "/bin/bash" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash"
/nix/store/00pdw4xa1i1wzz5j1arkw20qzf9gpb5j-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-vet: interpreter directive changed from "/bin/bash" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash"
/nix/store/00pdw4xa1i1wzz5j1arkw20qzf9gpb5j-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-lint: interpreter directive changed from "/bin/bash" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash"
/nix/store/00pdw4xa1i1wzz5j1arkw20qzf9gpb5j-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-git-marks: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash"
/nix/store/00pdw4xa1i1wzz5j1arkw20qzf9gpb5j-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/make.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash"
checking for references to /build in /nix/store/00pdw4xa1i1wzz5j1arkw20qzf9gpb5j-skopeo-0.1.30...
/nix/store/wdjqj16p90spal13av87rp42anzzpz29-skopeo-0.1.30-bin

@nlewo
Copy link
Member Author

nlewo commented May 24, 2018

cc @Profpatsch @aszlig

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: skopeo

Partial log (click to expand)

/nix/store/w6qrkjl4b7ylrm73l6qlwf8wrrg3k8gv-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/libdm_tag.sh: interpreter directive changed from "/bin/bash" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash"
/nix/store/w6qrkjl4b7ylrm73l6qlwf8wrrg3k8gv-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/make.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash"
/nix/store/w6qrkjl4b7ylrm73l6qlwf8wrrg3k8gv-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/make/test-integration: interpreter directive changed from "/bin/bash" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash"
/nix/store/w6qrkjl4b7ylrm73l6qlwf8wrrg3k8gv-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-git-marks: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash"
/nix/store/w6qrkjl4b7ylrm73l6qlwf8wrrg3k8gv-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-gofmt: interpreter directive changed from "/bin/bash" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash"
/nix/store/w6qrkjl4b7ylrm73l6qlwf8wrrg3k8gv-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-lint: interpreter directive changed from "/bin/bash" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash"
/nix/store/w6qrkjl4b7ylrm73l6qlwf8wrrg3k8gv-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/make/validate-vet: interpreter directive changed from "/bin/bash" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash"
/nix/store/w6qrkjl4b7ylrm73l6qlwf8wrrg3k8gv-skopeo-0.1.30/share/go/src/github.com/projectatomic/skopeo/hack/travis_osx.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/l4w7xwjy2nmk31fl5kgyy7gg8z7l9n8z-bash-4.4-p19/bin/bash"
checking for references to /build in /nix/store/w6qrkjl4b7ylrm73l6qlwf8wrrg3k8gv-skopeo-0.1.30...
/nix/store/y09albhvia0bgg5xddhdsmfvm3x42xmy-skopeo-0.1.30-bin

@globin globin merged commit 8f71ce7 into NixOS:master May 24, 2018
@nlewo nlewo deleted the pr-skopeo branch July 30, 2018 08:13
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

3 participants