Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update docker-library golang images to 1.8 #2663

Merged
merged 1 commit into from
Feb 16, 2017
Merged

Update docker-library golang images to 1.8 #2663

merged 1 commit into from
Feb 16, 2017

Conversation

belak
Copy link
Contributor

@belak belak commented Feb 16, 2017

This also replaces the tags for 1 and latest (and related variants) with the 1.8 versions

@yosifkit
Copy link
Member 

diff --git a/golang_alpine/17847.patch b/golang_1.7-alpine/17847.patch
similarity index 100%
rename from golang_alpine/17847.patch
rename to golang_1.7-alpine/17847.patch
diff --git a/golang_alpine/Dockerfile b/golang_1.7-alpine/Dockerfile
similarity index 100%
copy from golang_alpine/Dockerfile
copy to golang_1.7-alpine/Dockerfile
diff --git a/golang_alpine3.5/go-wrapper b/golang_1.7-alpine/go-wrapper
similarity index 100%
rename from golang_alpine3.5/go-wrapper
rename to golang_1.7-alpine/go-wrapper
diff --git a/golang_alpine3.5/no-pic.patch b/golang_1.7-alpine/no-pic.patch
similarity index 100%
rename from golang_alpine3.5/no-pic.patch
rename to golang_1.7-alpine/no-pic.patch
diff --git a/golang_alpine3.5/17847.patch b/golang_1.7-alpine3.5/17847.patch
similarity index 100%
rename from golang_alpine3.5/17847.patch
rename to golang_1.7-alpine3.5/17847.patch
diff --git a/golang_alpine3.5/Dockerfile b/golang_1.7-alpine3.5/Dockerfile
similarity index 100%
rename from golang_alpine3.5/Dockerfile
rename to golang_1.7-alpine3.5/Dockerfile
diff --git a/golang_rc-alpine/go-wrapper b/golang_1.7-alpine3.5/go-wrapper
similarity index 100%
rename from golang_rc-alpine/go-wrapper
rename to golang_1.7-alpine3.5/go-wrapper
diff --git a/golang_alpine/no-pic.patch b/golang_1.7-alpine3.5/no-pic.patch
similarity index 100%
copy from golang_alpine/no-pic.patch
copy to golang_1.7-alpine3.5/no-pic.patch
diff --git a/golang_nanoserver/Dockerfile b/golang_1.7-nanoserver/Dockerfile
similarity index 100%
copy from golang_nanoserver/Dockerfile
copy to golang_1.7-nanoserver/Dockerfile
diff --git a/golang_onbuild/Dockerfile b/golang_1.7-onbuild/Dockerfile
similarity index 100%
copy from golang_onbuild/Dockerfile
copy to golang_1.7-onbuild/Dockerfile
diff --git a/golang_wheezy/Dockerfile b/golang_1.7-wheezy/Dockerfile
similarity index 100%
rename from golang_wheezy/Dockerfile
rename to golang_1.7-wheezy/Dockerfile
diff --git a/golang_rc-stretch/go-wrapper b/golang_1.7-wheezy/go-wrapper
similarity index 100%
rename from golang_rc-stretch/go-wrapper
rename to golang_1.7-wheezy/go-wrapper
diff --git a/golang_windowsservercore/Dockerfile b/golang_1.7-windowsservercore/Dockerfile
similarity index 100%
copy from golang_windowsservercore/Dockerfile
copy to golang_1.7-windowsservercore/Dockerfile
diff --git a/golang_latest/Dockerfile b/golang_1.7/Dockerfile
similarity index 100%
copy from golang_latest/Dockerfile
copy to golang_1.7/Dockerfile
diff --git a/golang_rc/go-wrapper b/golang_1.7/go-wrapper
similarity index 100%
rename from golang_rc/go-wrapper
rename to golang_1.7/go-wrapper
diff --git a/golang_alpine/Dockerfile b/golang_alpine/Dockerfile
index 74f0336..c458892 100644
--- a/golang_alpine/Dockerfile
+++ b/golang_alpine/Dockerfile
@@ -1,15 +1,13 @@
-FROM alpine:3.4
+FROM alpine:3.5
 
 RUN apk add --no-cache ca-certificates
 
-ENV GOLANG_VERSION 1.7.5
+ENV GOLANG_VERSION 1.8
 ENV GOLANG_SRC_URL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz
-ENV GOLANG_SRC_SHA256 4e834513a2079f8cbbd357502cccaac9507fd00a1efe672375798858ff291815
+ENV GOLANG_SRC_SHA256 406865f587b44be7092f206d73fc1de252600b79b3cacc587b74b5ef5c623596
 
 # https://golang.org/issue/14851
 COPY no-pic.patch /
-# https://golang.org/issue/17847
-COPY 17847.patch /
 
 RUN set -ex \
 	&& apk add --no-cache --virtual .build-deps \
@@ -27,7 +25,6 @@ RUN set -ex \
 	&& rm golang.tar.gz \
 	&& cd /usr/local/go/src \
 	&& patch -p2 -i /no-pic.patch \
-	&& patch -p2 -i /17847.patch \
 	&& ./make.bash \
 	\
 	&& rm -rf /*.patch \
diff --git a/golang_alpine/no-pic.patch b/golang_alpine/no-pic.patch
index b10f290..9da7992 100644
--- a/golang_alpine/no-pic.patch
+++ b/golang_alpine/no-pic.patch
@@ -11,6 +11,6 @@ index 14f4fa9..5599307 100644
 +	// https://github.com/golang/go/issues/6940
 +	argv = append(argv, "-fno-PIC")
 +
- 	if Debug['v'] != 0 {
- 		fmt.Fprintf(Bso, "host link:")
+ 	if l.Debugvlog != 0 {
+ 		l.Logf("%5.2f host link:", obj.Cputime())
  		for _, v := range argv {
diff --git a/golang_latest/Dockerfile b/golang_latest/Dockerfile
index 7e227c2..3523877 100644
--- a/golang_latest/Dockerfile
+++ b/golang_latest/Dockerfile
@@ -9,9 +9,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		pkg-config \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.7.5
+ENV GOLANG_VERSION 1.8
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256 2e4dd6c44f0693bef4e7b46cc701513d74c3cc44f2419bf519d7868b12931ac3
+ENV GOLANG_DOWNLOAD_SHA256 53ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca
 
 RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
 	&& echo "$GOLANG_DOWNLOAD_SHA256  golang.tar.gz" | sha256sum -c - \
diff --git a/golang_nanoserver/Dockerfile b/golang_nanoserver/Dockerfile
index 8d668bc..f46ea11 100644
--- a/golang_nanoserver/Dockerfile
+++ b/golang_nanoserver/Dockerfile
@@ -16,9 +16,9 @@ RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
 	setx /M PATH $newPath;
 # doing this first to share cache across versions more aggressively
 
-ENV GOLANG_VERSION 1.7.5
+ENV GOLANG_VERSION 1.8
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.windows-amd64.zip
-ENV GOLANG_DOWNLOAD_SHA256 01eb518cb5a12edd6cf7380ec17ebedee755e3ce7e5362febeebb9e70e45fcaa
+ENV GOLANG_DOWNLOAD_SHA256 cb27fe210f3a9d10329d48514895d2a1e3651125a7c3c758f0358a5bfc0e3060
 
 RUN Write-Host ('Downloading {0} ...' -f $env:GOLANG_DOWNLOAD_URL); \
 	Invoke-WebRequest -Uri $env:GOLANG_DOWNLOAD_URL -OutFile 'go.zip'; \
diff --git a/golang_onbuild/Dockerfile b/golang_onbuild/Dockerfile
index 8059911..a4355c6 100644
--- a/golang_onbuild/Dockerfile
+++ b/golang_onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.7
+FROM golang:1.8
 
 RUN mkdir -p /go/src/app
 WORKDIR /go/src/app
diff --git a/golang_rc-alpine/Dockerfile b/golang_rc-alpine/Dockerfile
deleted file mode 100644
index 4966eaa..0000000
diff --git a/golang_rc-alpine/no-pic.patch b/golang_rc-alpine/no-pic.patch
deleted file mode 100644
index 9da7992..0000000
diff --git a/golang_rc-nanoserver/Dockerfile b/golang_rc-nanoserver/Dockerfile
deleted file mode 100644
index 79c21e8..0000000
diff --git a/golang_rc-onbuild/Dockerfile b/golang_rc-onbuild/Dockerfile
deleted file mode 100644
index 00ef782..0000000
diff --git a/golang_rc-windowsservercore/Dockerfile b/golang_rc-windowsservercore/Dockerfile
deleted file mode 100644
index eacc38a..0000000
diff --git a/golang_rc/Dockerfile b/golang_rc/Dockerfile
deleted file mode 100644
index dd88ad3..0000000
diff --git a/golang_rc-stretch/Dockerfile b/golang_stretch/Dockerfile
similarity index 84%
rename from golang_rc-stretch/Dockerfile
rename to golang_stretch/Dockerfile
index a025f6e..74a77d5 100644
--- a/golang_rc-stretch/Dockerfile
+++ b/golang_stretch/Dockerfile
@@ -9,9 +9,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		pkg-config \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.8rc3
+ENV GOLANG_VERSION 1.8
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.linux-amd64.tar.gz
-ENV GOLANG_DOWNLOAD_SHA256 0ff3faba02ac83920a65b453785771e75f128fbf9ba4ad1d5e72c044103f9c7a
+ENV GOLANG_DOWNLOAD_SHA256 53ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca
 
 RUN curl -fsSL "$GOLANG_DOWNLOAD_URL" -o golang.tar.gz \
 	&& echo "$GOLANG_DOWNLOAD_SHA256  golang.tar.gz" | sha256sum -c - \
diff --git a/golang_wheezy/go-wrapper b/golang_stretch/go-wrapper
similarity index 100%
rename from golang_wheezy/go-wrapper
rename to golang_stretch/go-wrapper
diff --git a/golang_windowsservercore/Dockerfile b/golang_windowsservercore/Dockerfile
index cd60557..50c5232 100644
--- a/golang_windowsservercore/Dockerfile
+++ b/golang_windowsservercore/Dockerfile
@@ -45,9 +45,9 @@ RUN $newPath = ('{0}\bin;C:\go\bin;{1}' -f $env:GOPATH, $env:PATH); \
 	[Environment]::SetEnvironmentVariable('PATH', $newPath, [EnvironmentVariableTarget]::Machine);
 # doing this first to share cache across versions more aggressively
 
-ENV GOLANG_VERSION 1.7.5
+ENV GOLANG_VERSION 1.8
 ENV GOLANG_DOWNLOAD_URL https://golang.org/dl/go$GOLANG_VERSION.windows-amd64.zip
-ENV GOLANG_DOWNLOAD_SHA256 01eb518cb5a12edd6cf7380ec17ebedee755e3ce7e5362febeebb9e70e45fcaa
+ENV GOLANG_DOWNLOAD_SHA256 cb27fe210f3a9d10329d48514895d2a1e3651125a7c3c758f0358a5bfc0e3060
 
 RUN Write-Host ('Downloading {0} ...' -f $env:GOLANG_DOWNLOAD_URL); \
 	Invoke-WebRequest -Uri $env:GOLANG_DOWNLOAD_URL -OutFile 'go.zip'; \

@yosifkit
Copy link
Member

Build test of #2663; 32b384b (golang):

$ bashbrew build golang:1.6.4
Using bashbrew/cache:2e9c46e376467a4e795b7708d7f29625db328544fc69f689fb71af579c4019eb (golang:1.6.4)
Tagging golang:1.6.4
Tagging golang:1.6

$ test/run.sh golang:1.6.4
testing golang:1.6.4
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'golang-hello-world' [5/5]...passed


$ bashbrew build golang:1.6.4-onbuild
Using bashbrew/cache:a9269947ed0e33927c29280a6dbd5859442afeab147d7accf700e7f90a532c0d (golang:1.6.4-onbuild)
Tagging golang:1.6.4-onbuild
Tagging golang:1.6-onbuild

$ test/run.sh golang:1.6.4-onbuild
testing golang:1.6.4-onbuild
	'override-cmd' [1/1]...passed


$ bashbrew build golang:1.6.4-wheezy
Using bashbrew/cache:40c05242f67bc765828c9bcac7bde4177586c1f15572506d7db9641eb171c1a3 (golang:1.6.4-wheezy)
Tagging golang:1.6.4-wheezy
Tagging golang:1.6-wheezy

$ test/run.sh golang:1.6.4-wheezy
testing golang:1.6.4-wheezy
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'golang-hello-world' [5/5]...passed


$ bashbrew build golang:1.6.4-alpine
Using bashbrew/cache:a44f9f3caf56bf27957d0be116df0b06c344c5caa88ab8248a6f1d498474e317 (golang:1.6.4-alpine)
Tagging golang:1.6.4-alpine
Tagging golang:1.6-alpine

$ test/run.sh golang:1.6.4-alpine
testing golang:1.6.4-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'golang-hello-world' [5/5]...passed


$ bashbrew build golang:1.6.4-windowsservercore
skipping "golang:1.6.4-windowsservercore" (due to unsatisfactory constraints ["windowsservercore"])

$ test/run.sh golang:1.6.4-windowsservercore
testing golang:1.6.4-windowsservercore
	image does not exist!


$ bashbrew build golang:1.6.4-nanoserver
skipping "golang:1.6.4-nanoserver" (due to unsatisfactory constraints ["nanoserver"])

$ test/run.sh golang:1.6.4-nanoserver
testing golang:1.6.4-nanoserver
	image does not exist!


$ bashbrew build golang:1.7.5
Using bashbrew/cache:69ae8a6e1ecc6311b2936ba92a8b3852b0afdaac519fb721fbaa7b3cf56aefe3 (golang:1.7.5)
Tagging golang:1.7.5
Tagging golang:1.7

$ test/run.sh golang:1.7.5
testing golang:1.7.5
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'golang-hello-world' [5/5]...passed


$ bashbrew build golang:1.7.5-onbuild
Using bashbrew/cache:583dd93344e05cb02806b19ee7e7cd49e562db5f4d7fd079dbf22bb70046cc7b (golang:1.7.5-onbuild)
Tagging golang:1.7.5-onbuild
Tagging golang:1.7-onbuild

$ test/run.sh golang:1.7.5-onbuild
testing golang:1.7.5-onbuild
	'override-cmd' [1/1]...passed


$ bashbrew build golang:1.7.5-wheezy
Using bashbrew/cache:2a38f284e5101fa7331ba4b2bda76f5601b9eb3da88299c479e4fc87dcc25369 (golang:1.7.5-wheezy)
Tagging golang:1.7.5-wheezy
Tagging golang:1.7-wheezy

$ test/run.sh golang:1.7.5-wheezy
testing golang:1.7.5-wheezy
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'golang-hello-world' [5/5]...passed


$ bashbrew build golang:1.7.5-alpine
Using bashbrew/cache:ceabc2a1e54a0673f9432c54d37de2e62133e077bee181f709869c81f241b974 (golang:1.7.5-alpine)
Tagging golang:1.7.5-alpine
Tagging golang:1.7-alpine

$ test/run.sh golang:1.7.5-alpine
testing golang:1.7.5-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'golang-hello-world' [5/5]...passed


$ bashbrew build golang:1.7.5-alpine3.5
Using bashbrew/cache:59573e21f6c5a1e43d5b54294ba3a8ca723bda2b83806d2f06550eeeab2baec1 (golang:1.7.5-alpine3.5)
Tagging golang:1.7.5-alpine3.5
Tagging golang:1.7-alpine3.5

$ test/run.sh golang:1.7.5-alpine3.5
testing golang:1.7.5-alpine3.5
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'golang-hello-world' [5/5]...passed


$ bashbrew build golang:1.7.5-windowsservercore
skipping "golang:1.7.5-windowsservercore" (due to unsatisfactory constraints ["windowsservercore"])

$ test/run.sh golang:1.7.5-windowsservercore
testing golang:1.7.5-windowsservercore
	image does not exist!


$ bashbrew build golang:1.7.5-nanoserver
skipping "golang:1.7.5-nanoserver" (due to unsatisfactory constraints ["nanoserver"])

$ test/run.sh golang:1.7.5-nanoserver
testing golang:1.7.5-nanoserver
	image does not exist!


$ bashbrew build golang:1.8.0
Building bashbrew/cache:0ec942273c6f8a1a729a906b68eb0367519ecb17c74ea5878cb49288639e5339 (golang:1.8.0)
Tagging golang:1.8.0
Tagging golang:1.8
Tagging golang:1
Tagging golang:latest

$ test/run.sh golang:1.8.0
testing golang:1.8.0
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'golang-hello-world' [5/5]...passed


$ bashbrew build golang:1.8.0-onbuild
Building bashbrew/cache:d7bb5d899e6023c23348efe5216e022653bf864d61b63f1208693ccfbf840e22 (golang:1.8.0-onbuild)
Tagging golang:1.8.0-onbuild
Tagging golang:1.8-onbuild
Tagging golang:1-onbuild
Tagging golang:onbuild

$ test/run.sh golang:1.8.0-onbuild
testing golang:1.8.0-onbuild
	'override-cmd' [1/1]...passed


$ bashbrew build golang:1.8.0-stretch
Building bashbrew/cache:661deebcec19981e591ee664e1435079ba9cbfb68d11b6df3f9301a3a39fba15 (golang:1.8.0-stretch)
Tagging golang:1.8.0-stretch
Tagging golang:1.8-stretch
Tagging golang:1-stretch
Tagging golang:stretch

$ test/run.sh golang:1.8.0-stretch
testing golang:1.8.0-stretch
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'golang-hello-world' [5/5]...passed


$ bashbrew build golang:1.8.0-alpine
Building bashbrew/cache:904628ac3bb685ec4242285810a2d56dd425cc5ec44480a218fc7aa7b4f391c9 (golang:1.8.0-alpine)
Tagging golang:1.8.0-alpine
Tagging golang:1.8-alpine
Tagging golang:1-alpine
Tagging golang:alpine

$ test/run.sh golang:1.8.0-alpine
testing golang:1.8.0-alpine
	'utc' [1/5]...passed
	'cve-2014--shellshock' [2/5]...passed
	'no-hard-coded-passwords' [3/5]...passed
	'override-cmd' [4/5]...passed
	'golang-hello-world' [5/5]...passed


$ bashbrew build golang:1.8.0-windowsservercore
skipping "golang:1.8.0-windowsservercore" (due to unsatisfactory constraints ["windowsservercore"])

$ test/run.sh golang:1.8.0-windowsservercore
testing golang:1.8.0-windowsservercore
	image does not exist!


$ bashbrew build golang:1.8.0-nanoserver
skipping "golang:1.8.0-nanoserver" (due to unsatisfactory constraints ["nanoserver"])

$ test/run.sh golang:1.8.0-nanoserver
testing golang:1.8.0-nanoserver
	image does not exist!

The following images failed at least one test:

  • golang:
    • golang:1.6.4-windowsservercore
    • golang:1.6.4-nanoserver
    • golang:1.7.5-windowsservercore
    • golang:1.7.5-nanoserver
    • golang:1.8.0-windowsservercore
    • golang:1.8.0-nanoserver

@tianon
Copy link
Member

tianon commented Feb 16, 2017

Windows test build:

$ bashbrew build 2>/dev/null https://raw.githubusercontent.com/belak/docker-library-official-images/32b384be4acad822d182b39234cc45b1a8f76913/library/golang
Using bashbrew/cache:8b7c649fa51906e85a9cda91d7b6067e47c9d096a7e8afbd984e6d093231f077 (golang:1.6.4-windowsservercore)
Tagging golang:1.6.4-windowsservercore
Tagging golang:1.6-windowsservercore
Using bashbrew/cache:6ec415888155188b4a536c37986bfbed67df1bce3b01f686230603b918757edc (golang:1.6.4-nanoserver)
Tagging golang:1.6.4-nanoserver
Tagging golang:1.6-nanoserver
Using bashbrew/cache:086446c085f4be8f43044d2d5bda58a40942033e597f637b7006126706343ca9 (golang:1.7.5-windowsservercore)
Tagging golang:1.7.5-windowsservercore
Tagging golang:1.7-windowsservercore
Using bashbrew/cache:9ef30dfbe9cbfe36aee1d18616259b8e79c9000293d804203d35f52fae733b4f (golang:1.7.5-nanoserver)
Tagging golang:1.7.5-nanoserver
Tagging golang:1.7-nanoserver
Building bashbrew/cache:cfdfcc9ccf80c0758583b5b751e4b89eb32c5c65ff4735156fcdcd82a7eef68a (golang:1.8.0-windowsservercore)
Tagging golang:1.8.0-windowsservercore
Tagging golang:1.8-windowsservercore
Tagging golang:1-windowsservercore
Tagging golang:windowsservercore
Building bashbrew/cache:23f5501a9da9fc7cd299eaa77cbf9ae68f759ef770679998e18480f976ea0fff (golang:1.8.0-nanoserver)
Tagging golang:1.8.0-nanoserver
Tagging golang:1.8-nanoserver
Tagging golang:1-nanoserver
Tagging golang:nanoserver

@tianon tianon merged commit ce57af7 into docker-library:master Feb 16, 2017
@belak belak deleted the belak/update-golang-1.8 branch February 16, 2017 23:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/golang
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@belak @yosifkit @tianon @docker-library-bot