fix dockertools.pullImage on darwin #41908
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GrahamcOfBorg
added
6.topic: darwin
|
Could you add to describe a bit these arguments and the default behavior in the manual? |
nicknovitski
force-pushed
the
dockertools-darwin
branch
2 times, most recently
from
428c44b
to
c2932a2
Compare
|
Like this? |
nicknovitski
force-pushed
the
dockertools-darwin
branch
from
c2932a2
to
3407cf3
Compare
|
@nicknovitski I was actually more talking about describing these new arguments of |
|
Oh, sure! 😄 |
|
(you can easily build the manual by running |
nicknovitski
force-pushed
the
dockertools-darwin
branch
2 times, most recently
from
a95816e
to
bf39fee
Compare
|
Thank you, I've fixed my build errors. |
|
@GrahamcOfBorg test docker-tools |
|
Success on aarch64-linux Attempted: tests.docker-tools No partial log is available. |
|
Failure on x86_64-linux (full log) Attempted: tests.docker-tools Partial log (click to expand)
|
|
I'm not sure I understand the failure, but it looks to me that like there's a nixos test for docker-tools, and some derivations it depends on failed to build. Is that right? |
nicknovitski
force-pushed
the
dockertools-darwin
branch
from
bf39fee
to
01af8f2
Compare
|
This looks good to me but I'm also not sure what the problem is with the test. |
|
@GrahamcOfBorg test docker-tools |
|
No attempt on x86_64-linux (full log) The following builds were skipped because they don't evaluate on x86_64-linux: tests.docker-tools Partial log (click to expand)
|
|
Success on aarch64-linux Attempted: tests.docker-tools No partial log is available. |
|
@GrahamcOfBorg build spokeo |
|
No attempt on x86_64-linux (full log) The following builds were skipped because they don't evaluate on x86_64-linux: spokeo Partial log (click to expand)
|
|
No attempt on aarch64-linux (full log) The following builds were skipped because they don't evaluate on aarch64-linux: spokeo Partial log (click to expand)
|
|
@GrahamcOfBorg build skopeo |
|
Success on x86_64-linux (full log) Attempted: skopeo Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: skopeo Partial log (click to expand)
|
copumpkin
reviewed
Jul 11, 2018
| @@ -37,8 +37,8 @@ buildGoPackage rec { | |||
| ''; | |||
|
|
|||
| preBuild = '' | |||
| export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include" | |||
| export CGO_LDFLAGS="-L${getLib gpgme}/lib -L${getLib libgpgerror}/lib -L${getLib devicemapper}/lib" | |||
| export CGO_CFLAGS="-I${getDev gpgme}/include${lib.optionalString stdenv.isLinux " -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include"}" | |||
There was a problem hiding this comment.
Might this make more sense as CGO_CFLAGS=$CFLAGS? and same with LDFLAGS. I think stdenv sets up the -I automatically for us in CFLAGS so this would mirror the buildInputs conditional logic more naturally.
There was a problem hiding this comment.
I'll try that.
|
No attempt on x86_64-darwin (full log) The following builds were skipped because they don't evaluate on x86_64-darwin: spokeo Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Attempted: skopeo Partial log (click to expand)
|
puffnfresh
approved these changes
Jul 11, 2018
|
Use it as an argument to buildImage. I've realized there isn't much I can do without cross-compilation, but, ehn, maybe I could try to make it work. |
|
@nicknovitski yeah, I've been working on https://github.com/nix-community/linuxkit-builder for this reason. Would love for my team to easily build Docker images using Nix on Darwin ❤️ |
|
As @copumpkin suggests, I'm going to try a simpler way of setting CGO_* env vars. e: pushed changes |
nicknovitski
force-pushed
the
dockertools-darwin
branch
from
01af8f2
to
6f6e582
Compare
GrahamcOfBorg
added
10.rebuild-linux: 1-10
and removed
10.rebuild-linux: 0
|
@puffnfresh in my case I found this because I wanted to interact with a docker registry with skopeo from my Mac 😄and of course skopeo doesn't work on macOS without this PR |
|
@copumpkin yeah, definitely no reason why Skopeo shouldn't work well on macOS. |
|
Could a Darwin |
|
@copumpkin should be able to |
nicknovitski
force-pushed
the
dockertools-darwin
branch
from
6f6e582
to
c58b11d
Compare
|
Rebased on upstream skopeo change. Is there something blocking this that I can fix? |
|
@GrahamcOfBorg build skopeo |
|
And no, if the borg says we're good, I'll click merge. Thanks for your patience @nicknovitski |
|
Success on x86_64-darwin (full log) Attempted: skopeo Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: skopeo Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: skopeo Partial log (click to expand)
|
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
buildImageworks, so I wanted to start using it.The
--override-{os,architecture}arguments are necessary for me, since skopeo's default behavior is to choose the manifest which matches the host system's os and architecture. For people on macs, this frequently doesn't exist, and is rarely what we want.Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)