Skip to content

dockerTools.pullImage: fix for skopeo 1.4.x#134071

Merged
roberth merged 1 commit intoNixOS:masterfrom
lukegb:skopeo-cli-change
Aug 14, 2021
Merged

dockerTools.pullImage: fix for skopeo 1.4.x#134071
roberth merged 1 commit intoNixOS:masterfrom
lukegb:skopeo-cli-change

Conversation

@lukegb
Copy link
Contributor

@lukegb lukegb commented Aug 14, 2021

Motivation for this change

Fixes #133515

skopeo 1.4.x doesn't accept --src-tls-verify as a flag to the program,
only as a flag to copy; we must pass it after the "copy" verb, or it
will fail with:

FATA[0000] unknown flag: --src-tls-verify

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 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.

skopeo 1.4.x doesn't accept --src-tls-verify as a flag to the *program*,
only as a flag to copy; we must pass it after the "copy" verb, or it
will fail with:

> FATA[0000] unknown flag: --src-tls-verify
@lukegb lukegb requested a review from roberth as a code owner August 14, 2021 21:23
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Aug 14, 2021
Copy link
Member

@roberth roberth left a comment

Choose a reason for hiding this comment

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

Change lgtm and tested manually, mucking about with nix-store --delete etc.

Merging after ofborg.

@roberth roberth merged commit 310dd71 into NixOS:master Aug 14, 2021
@roberth
Copy link
Member

roberth commented Aug 14, 2021

Thank you!

@antifuchs
Copy link
Contributor

Thanks so much for the quick fix to this!

@lukegb lukegb deleted the skopeo-cli-change branch August 16, 2021 02:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

dockerTools.pullImage: errors from skopeo about --src-tls-verify (difficult to repro)

3 participants