hack/make.ps1: don't rely on GO_VERSION#37592
Merged
vdemeester merged 1 commit intomoby:masterfrom Aug 16, 2018
Merged
Conversation
kolyshkin
force-pushed
the
no-go-version-env
branch
from
42c44df to
516befc
Compare
Codecov Report
@@ Coverage Diff @@
## master #37592 +/- ##
=========================================
Coverage ? 35.61%
=========================================
Files ? 611
Lines ? 44967
Branches ? 0
=========================================
Hits ? 16015
Misses ? 26742
Partials ? 2210 |
kolyshkin
force-pushed
the
no-go-version-env
branch
2 times, most recently
from
55df9e0 to
2e601b3
Compare
kolyshkin
force-pushed
the
no-go-version-env
branch
3 times, most recently
from
77d1fd3 to
5d0616c
Compare
Contributor
Author
|
OK, looks like it didn't work only because this PR modified both |
Contributor
Author
|
OK, it looks like one can not patch both |
kolyshkin
force-pushed
the
no-go-version-env
branch
from
5d0616c to
0d9a15a
Compare
kolyshkin
changed the title
Modify hack/make.ps1 to use the version value used in "FROM golang" statement. While at it: 1. Make search expression a bit more strict (use ^ to match at BOL only). 2. Simplify by removing Get-Contents as Select-String can read files. After this, ENV GO_VERSION can be removed from Dockerfile. Unfortunately it can't be done in one commit as Windows CI fails (presumably because Dockerfile is being modified in place). Signed-off-by: Kir Kolyshkin <[email protected]>
kolyshkin
force-pushed
the
no-go-version-env
branch
from
0d9a15a to
6a28513
Compare
Contributor
Author
|
@johnstep @jhowardmsft PTAL; should be trivial to merge |
johnstep
approved these changes
Aug 16, 2018
Merged
kolyshkin
added a commit
to kolyshkin/moby
that referenced
this pull request
Sep 6, 2018
It's that time of year again! Go 1.11 is released, time to use it. This commit also * removes our archive/tar fork, since upstream archive/tar is fixed for static builds, and osusergo build tag is set. * removes ENV GO_VERSION from Dockerfile as it's not needed anymore since PR moby#37592 is merged. [v2: switch to beta2] [v3: switch to beta3] [v4: rc1] [v5: remove ENV GO_VERSION as PR moby#37592 is now merged] [v6: rc2] [v7: final!] [v8: use 1.11.0] [v9: back to 1.11] [v8: use 1.11.0] Signed-off-by: Kir Kolyshkin <[email protected]>
thaJeztah
pushed a commit
to thaJeztah/docker
that referenced
this pull request
Jun 20, 2019
It's that time of year again! Go 1.11 is released, time to use it. This commit also * removes our archive/tar fork, since upstream archive/tar is fixed for static builds, and osusergo build tag is set. * removes ENV GO_VERSION from Dockerfile as it's not needed anymore since PR moby#37592 is merged. [v2: switch to beta2] [v3: switch to beta3] [v4: rc1] [v5: remove ENV GO_VERSION as PR moby#37592 is now merged] [v6: rc2] [v7: final!] [v8: use 1.11.0] [v9: back to 1.11] [v8: use 1.11.0] Signed-off-by: Kir Kolyshkin <[email protected]> (cherry picked from commit 10fd051) Signed-off-by: Sebastiaan van Stijn <[email protected]>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
This removes the last use of
ENV GO_VERSIONwhich happened to be inhack/make.ps. Once this is merged, we can removeENV GO_VERSIONfrom the Dockerfile.Apparently one can't modify both
Dockerfileandhack/make.ps1in a single commit (although I fail to understand why), so Dockerfile remains intact for now.