This repository has been archived by the owner on Jun 13, 2021. It is now read-only.
Configure GOPROXY #606
Merged
Configure GOPROXY #606
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
Codecov Report
@@ Coverage Diff @@
## master #606 +/- ##
=========================================
- Coverage 72.69% 72.4% -0.29%
=========================================
Files 54 54
Lines 2809 2765 -44
=========================================
- Hits 2042 2002 -40
+ Misses 508 506 -2
+ Partials 259 257 -2
Continue to review full report at Codecov.
|
ndeloof
force-pushed
the
goproxy
branch
2 times, most recently
from
872413a
to
f6e35d2
Compare
ndeloof
commented
Sep 3, 2019
Dockerfile
Outdated
| @@ -10,6 +10,7 @@ WORKDIR /go/src/github.com/docker/cli | |||
|
|
|||
| RUN git clone https://github.com/docker/cli . && git checkout a1b83ffd2cbeefc0752e5aa7a543d49c1ddfd2cb | |||
|
|
|||
| ARG GOPROXY=direct | |||
There was a problem hiding this comment.
Significant issue I see here is that this forces a value to GOPROXY, not just let us override the default one on purpose. Any suggestions for adequate docker build hack is welcome :)
There was a problem hiding this comment.
Same as for the command-line argument, you can omit the value (and =);
1. no --build-arg
docker build -<<'EOF'
FROM busybox
ARG GOPROXY
RUN env && exit 1
EOF
> [2/2] RUN env && exit 1:
#5 0.563 SHLVL=1
#5 0.563 HOME=/root
#5 0.563 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
#5 0.563 PWD=/2. with --build-arg=GOPROXY, but no env-var set
docker build --build-arg=GOPROXY -<<'EOF'
FROM busybox
ARG GOPROXY
RUN env && exit 1
EOF
> [2/2] RUN env && exit 1:
#4 0.329 SHLVL=1
#4 0.329 HOME=/root
#4 0.329 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
#4 0.329 PWD=/3. with --build-arg=GOPROXY and $GOPROXY set as env-var
GOPROXY=direct docker build --build-arg=GOPROXY -<<'EOF'
FROM busybox
ARG GOPROXY
RUN env && exit 1
EOF
> [2/2] RUN env && exit 1:
#5 0.376 SHLVL=1
#5 0.376 HOME=/root
#5 0.376 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
#5 0.376 GOPROXY=direct
#5 0.376 PWD=/4. with value passed as --build-arg=GOPROXY=foobar
docker build --build-arg=GOPROXY=foobar -<<'EOF'
FROM busybox
ARG GOPROXY
RUN env && exit 1
EOF
> [2/2] RUN env && exit 1:
#5 0.327 SHLVL=1
#5 0.327 HOME=/root
#5 0.327 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
#5 0.327 GOPROXY=foobar
#5 0.327 PWD=/
thaJeztah
suggested changes
Sep 3, 2019
docker.Makefile
Outdated
| @@ -17,6 +17,10 @@ SCHEMAS_CTNR_NAME := $(BIN_NAME)-schemas-$(TAG) | |||
|
|
|||
| BUILD_ARGS=--build-arg=EXPERIMENTAL=$(EXPERIMENTAL) --build-arg=TAG=$(TAG) --build-arg=COMMIT=$(COMMIT) --build-arg=ALPINE_VERSION=$(ALPINE_VERSION) | |||
|
|
|||
| ifneq ($(GOPROXY),) | |||
| BUILD_ARGS = $(BUILD_ARGS) --build-arg=GOPROXY=$(GOPROXY) | |||
There was a problem hiding this comment.
Not sure if it helps, but omitting the value (and the =, because that implicitly is equal to ="") will take the value from the current environment, so if GOPROXY is not set as an environment variable, it won't be passed as a build-arg
--build-arg=GOPROXY
Dockerfile
Outdated
| @@ -10,6 +10,7 @@ WORKDIR /go/src/github.com/docker/cli | |||
|
|
|||
| RUN git clone https://github.com/docker/cli . && git checkout a1b83ffd2cbeefc0752e5aa7a543d49c1ddfd2cb | |||
|
|
|||
| ARG GOPROXY=direct | |||
There was a problem hiding this comment.
Same as for the command-line argument, you can omit the value (and =);
1. no --build-arg
docker build -<<'EOF'
FROM busybox
ARG GOPROXY
RUN env && exit 1
EOF
> [2/2] RUN env && exit 1:
#5 0.563 SHLVL=1
#5 0.563 HOME=/root
#5 0.563 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
#5 0.563 PWD=/2. with --build-arg=GOPROXY, but no env-var set
docker build --build-arg=GOPROXY -<<'EOF'
FROM busybox
ARG GOPROXY
RUN env && exit 1
EOF
> [2/2] RUN env && exit 1:
#4 0.329 SHLVL=1
#4 0.329 HOME=/root
#4 0.329 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
#4 0.329 PWD=/3. with --build-arg=GOPROXY and $GOPROXY set as env-var
GOPROXY=direct docker build --build-arg=GOPROXY -<<'EOF'
FROM busybox
ARG GOPROXY
RUN env && exit 1
EOF
> [2/2] RUN env && exit 1:
#5 0.376 SHLVL=1
#5 0.376 HOME=/root
#5 0.376 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
#5 0.376 GOPROXY=direct
#5 0.376 PWD=/4. with value passed as --build-arg=GOPROXY=foobar
docker build --build-arg=GOPROXY=foobar -<<'EOF'
FROM busybox
ARG GOPROXY
RUN env && exit 1
EOF
> [2/2] RUN env && exit 1:
#5 0.327 SHLVL=1
#5 0.327 HOME=/root
#5 0.327 PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
#5 0.327 GOPROXY=foobar
#5 0.327 PWD=/
|
@thaJeztah great suggestion, I didn't know about the |
|
Works the same for |
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
- What I did
introduce support for GOPROXY
- How I did it
pass --build-arg according to local value.
set GOPROXY to
directfor CI- How to verify it
No obvious way
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)