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
hack/make.ps1: don't rely on GO_VERSION #37592
Conversation
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 |
55df9e0
to
2e601b3
Compare
77d1fd3
to
5d0616c
Compare
OK, looks like it didn't work only because this PR modified both |
OK, it looks like one can not patch both |
5d0616c
to
0d9a15a
Compare
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 <kolyshkin@gmail.com>
0d9a15a
to
6a28513
Compare
@johnstep @jhowardmsft PTAL; should be trivial to merge |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 🐯
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 <kolyshkin@gmail.com>
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 <kolyshkin@gmail.com> (cherry picked from commit 10fd051) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This removes the last use of
ENV GO_VERSION
which happened to be inhack/make.ps
. Once this is merged, we can removeENV GO_VERSION
from the Dockerfile.Apparently one can't modify both
Dockerfile
andhack/make.ps1
in a single commit (although I fail to understand why), so Dockerfile remains intact for now.