Update golang #7202
Merged
Update golang #7202
Conversation
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
Changes: - docker-library/golang@7479804: Merge pull request docker-library/golang#314 from infosiftr/armv7 - docker-library/golang@73558b6: Appropriately set GOARM on Alpine's armv7 - docker-library/golang@3f57232: Merge pull request docker-library/golang#313 from sapk-fork/alpine-3-11 - docker-library/golang@4bf3297: Add alpine:3.11
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index ef00d0f..f81c385 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,10 +1,10 @@
-golang:1.12-alpine3.9 @ amd64
-golang:1.12-alpine3.9 @ arm32v6
-golang:1.12-alpine3.9 @ arm32v7
-golang:1.12-alpine3.9 @ arm64v8
-golang:1.12-alpine3.9 @ i386
-golang:1.12-alpine3.9 @ ppc64le
-golang:1.12-alpine3.9 @ s390x
+golang:1.12-alpine3.10 @ amd64
+golang:1.12-alpine3.10 @ arm32v6
+golang:1.12-alpine3.10 @ arm32v7
+golang:1.12-alpine3.10 @ arm64v8
+golang:1.12-alpine3.10 @ i386
+golang:1.12-alpine3.10 @ ppc64le
+golang:1.12-alpine3.10 @ s390x
golang:1.12-alpine @ amd64
golang:1.12-alpine @ arm32v6
golang:1.12-alpine @ arm32v7
@@ -27,6 +27,13 @@ golang:1.12-stretch @ ppc64le
golang:1.12-stretch @ s390x
golang:1.12-windowsservercore-1809 @ windows-amd64
golang:1.12-windowsservercore-ltsc2016 @ windows-amd64
+golang:alpine3.10 @ amd64
+golang:alpine3.10 @ arm32v6
+golang:alpine3.10 @ arm32v7
+golang:alpine3.10 @ arm64v8
+golang:alpine3.10 @ i386
+golang:alpine3.10 @ ppc64le
+golang:alpine3.10 @ s390x
golang:alpine @ amd64
golang:alpine @ arm32v6
golang:alpine @ arm32v7
diff --git a/_bashbrew-list b/_bashbrew-list
index 345af19..a768b51 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,6 +1,7 @@
golang:1
golang:1-alpine
golang:1-alpine3.10
+golang:1-alpine3.11
golang:1-buster
golang:1-nanoserver
golang:1-nanoserver-1809
@@ -10,8 +11,8 @@ golang:1-windowsservercore-1809
golang:1-windowsservercore-ltsc2016
golang:1.12
golang:1.12-alpine
-golang:1.12-alpine3.9
golang:1.12-alpine3.10
+golang:1.12-alpine3.11
golang:1.12-buster
golang:1.12-nanoserver
golang:1.12-nanoserver-1809
@@ -21,8 +22,8 @@ golang:1.12-windowsservercore-1809
golang:1.12-windowsservercore-ltsc2016
golang:1.12.14
golang:1.12.14-alpine
-golang:1.12.14-alpine3.9
golang:1.12.14-alpine3.10
+golang:1.12.14-alpine3.11
golang:1.12.14-buster
golang:1.12.14-nanoserver
golang:1.12.14-nanoserver-1809
@@ -33,6 +34,7 @@ golang:1.12.14-windowsservercore-ltsc2016
golang:1.13
golang:1.13-alpine
golang:1.13-alpine3.10
+golang:1.13-alpine3.11
golang:1.13-buster
golang:1.13-nanoserver
golang:1.13-nanoserver-1809
@@ -43,6 +45,7 @@ golang:1.13-windowsservercore-ltsc2016
golang:1.13.5
golang:1.13.5-alpine
golang:1.13.5-alpine3.10
+golang:1.13.5-alpine3.11
golang:1.13.5-buster
golang:1.13.5-nanoserver
golang:1.13.5-nanoserver-1809
@@ -52,7 +55,7 @@ golang:1.13.5-windowsservercore-1809
golang:1.13.5-windowsservercore-ltsc2016
golang:1.14beta1
golang:1.14beta1-alpine
-golang:1.14beta1-alpine3.10
+golang:1.14beta1-alpine3.11
golang:1.14beta1-buster
golang:1.14beta1-nanoserver
golang:1.14beta1-nanoserver-1809
@@ -61,7 +64,7 @@ golang:1.14beta1-windowsservercore-1809
golang:1.14beta1-windowsservercore-ltsc2016
golang:1.14-rc
golang:1.14-rc-alpine
-golang:1.14-rc-alpine3.10
+golang:1.14-rc-alpine3.11
golang:1.14-rc-buster
golang:1.14-rc-nanoserver
golang:1.14-rc-nanoserver-1809
@@ -70,13 +73,14 @@ golang:1.14-rc-windowsservercore-1809
golang:1.14-rc-windowsservercore-ltsc2016
golang:alpine
golang:alpine3.10
+golang:alpine3.11
golang:buster
golang:latest
golang:nanoserver
golang:nanoserver-1809
golang:rc
golang:rc-alpine
-golang:rc-alpine3.10
+golang:rc-alpine3.11
golang:rc-buster
golang:rc-nanoserver
golang:rc-nanoserver-1809
diff --git a/golang_1.12-alpine/Dockerfile b/golang_1.12-alpine/Dockerfile
index f9c72ed..019ffda 100644
--- a/golang_1.12-alpine/Dockerfile
+++ b/golang_1.12-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.11
RUN apk add --no-cache \
ca-certificates
@@ -33,6 +33,7 @@ RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
armhf) export GOARM='6' ;; \
+ armv7) export GOARM='7' ;; \
x86) export GO386='387' ;; \
esac; \
\
diff --git a/golang_1.12-alpine3.9/Dockerfile b/golang_1.12-alpine3.10/Dockerfile
similarity index 97%
rename from golang_1.12-alpine3.9/Dockerfile
rename to golang_1.12-alpine3.10/Dockerfile
index 8441c54..27fbc1b 100644
--- a/golang_1.12-alpine3.9/Dockerfile
+++ b/golang_1.12-alpine3.10/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.10
RUN apk add --no-cache \
ca-certificates
@@ -33,6 +33,7 @@ RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
armhf) export GOARM='6' ;; \
+ armv7) export GOARM='7' ;; \
x86) export GO386='387' ;; \
esac; \
\
diff --git a/golang_alpine/Dockerfile b/golang_alpine/Dockerfile
index 58d7966..485a4a1 100644
--- a/golang_alpine/Dockerfile
+++ b/golang_alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.11
RUN apk add --no-cache \
ca-certificates
@@ -33,6 +33,7 @@ RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
armhf) export GOARM='6' ;; \
+ armv7) export GOARM='7' ;; \
x86) export GO386='387' ;; \
esac; \
\
diff --git a/golang_alpine/Dockerfile b/golang_alpine3.10/Dockerfile
similarity index 98%
copy from golang_alpine/Dockerfile
copy to golang_alpine3.10/Dockerfile
index 58d7966..ebfb43c 100644
--- a/golang_alpine/Dockerfile
+++ b/golang_alpine3.10/Dockerfile
@@ -33,6 +33,7 @@ RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
armhf) export GOARM='6' ;; \
+ armv7) export GOARM='7' ;; \
x86) export GO386='387' ;; \
esac; \
\
diff --git a/golang_rc-alpine/Dockerfile b/golang_rc-alpine/Dockerfile
index 8eda82d..8323e9f 100644
--- a/golang_rc-alpine/Dockerfile
+++ b/golang_rc-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.11
RUN apk add --no-cache \
ca-certificates
@@ -33,6 +33,7 @@ RUN set -eux; \
apkArch="$(apk --print-arch)"; \
case "$apkArch" in \
armhf) export GOARM='6' ;; \
+ armv7) export GOARM='7' ;; \
x86) export GO386='387' ;; \
esac; \
\ |
|
Build test of #7202; e755c95; $ bashbrew build golang:1.14beta1-buster
Using bashbrew/cache:8539b00e1a2d368709018d8054894983b733265b149fa380f903a161c5c99aa7 (golang:1.14beta1-buster)
Tagging golang:1.14beta1-buster
Tagging golang:1.14-rc-buster
Tagging golang:rc-buster
Tagging golang:1.14beta1
Tagging golang:1.14-rc
Tagging golang:rc
$ test/run.sh golang:1.14beta1-buster
testing golang:1.14beta1-buster
'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.14beta1-alpine3.11
Building bashbrew/cache:ab7e619a8d1260464e5a32a17b16bfcb5f25e626243323150a450488c06c7430 (golang:1.14beta1-alpine3.11)
Tagging golang:1.14beta1-alpine3.11
Tagging golang:1.14-rc-alpine3.11
Tagging golang:rc-alpine3.11
Tagging golang:1.14beta1-alpine
Tagging golang:1.14-rc-alpine
Tagging golang:rc-alpine
$ test/run.sh golang:1.14beta1-alpine3.11
testing golang:1.14beta1-alpine3.11
'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.14beta1-windowsservercore-ltsc2016
skipping "golang:1.14beta1-windowsservercore-ltsc2016" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh golang:1.14beta1-windowsservercore-ltsc2016
testing golang:1.14beta1-windowsservercore-ltsc2016
image has no tests...skipping
$ bashbrew build golang:1.14beta1-windowsservercore-1809
skipping "golang:1.14beta1-windowsservercore-1809" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh golang:1.14beta1-windowsservercore-1809
testing golang:1.14beta1-windowsservercore-1809
image has no tests...skipping
$ bashbrew build golang:1.14beta1-nanoserver-1809
skipping "golang:1.14beta1-nanoserver-1809" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh golang:1.14beta1-nanoserver-1809
testing golang:1.14beta1-nanoserver-1809
image has no tests...skipping
$ bashbrew build golang:1.13.5-buster
Using bashbrew/cache:1711c29a7f904e9f648220a0a2000ee57ecc55c457548641f2dcc001db1a8301 (golang:1.13.5-buster)
Tagging golang:1.13.5-buster
Tagging golang:1.13-buster
Tagging golang:1-buster
Tagging golang:buster
Tagging golang:1.13.5
Tagging golang:1.13
Tagging golang:1
Tagging golang:latest
$ test/run.sh golang:1.13.5-buster
testing golang:1.13.5-buster
'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.13.5-stretch
Using bashbrew/cache:022f8335046fed8b0ecfcee8a0e125215e8f5992741e177a3493877b01a2c6de (golang:1.13.5-stretch)
Tagging golang:1.13.5-stretch
Tagging golang:1.13-stretch
Tagging golang:1-stretch
Tagging golang:stretch
$ test/run.sh golang:1.13.5-stretch
testing golang:1.13.5-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.13.5-alpine3.11
Building bashbrew/cache:8617098e143c9d8313a76248ebe50c831bbca2ff267b3385690bfa4fc5dc57c5 (golang:1.13.5-alpine3.11)
Tagging golang:1.13.5-alpine3.11
Tagging golang:1.13-alpine3.11
Tagging golang:1-alpine3.11
Tagging golang:alpine3.11
Tagging golang:1.13.5-alpine
Tagging golang:1.13-alpine
Tagging golang:1-alpine
Tagging golang:alpine
$ test/run.sh golang:1.13.5-alpine3.11
testing golang:1.13.5-alpine3.11
'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.13.5-alpine3.10
Building bashbrew/cache:569766ce6830f6d044963a64236bef04e46434e4716111108bb5bfec638e2609 (golang:1.13.5-alpine3.10)
Tagging golang:1.13.5-alpine3.10
Tagging golang:1.13-alpine3.10
Tagging golang:1-alpine3.10
Tagging golang:alpine3.10
$ test/run.sh golang:1.13.5-alpine3.10
testing golang:1.13.5-alpine3.10
'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.13.5-windowsservercore-ltsc2016
skipping "golang:1.13.5-windowsservercore-ltsc2016" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh golang:1.13.5-windowsservercore-ltsc2016
testing golang:1.13.5-windowsservercore-ltsc2016
image has no tests...skipping
$ bashbrew build golang:1.13.5-windowsservercore-1809
skipping "golang:1.13.5-windowsservercore-1809" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh golang:1.13.5-windowsservercore-1809
testing golang:1.13.5-windowsservercore-1809
image has no tests...skipping
$ bashbrew build golang:1.13.5-nanoserver-1809
skipping "golang:1.13.5-nanoserver-1809" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh golang:1.13.5-nanoserver-1809
testing golang:1.13.5-nanoserver-1809
image has no tests...skipping
$ bashbrew build golang:1.12.14-buster
Using bashbrew/cache:7479fc4f2743b449347695f21926c4c2eca865d01626ceac3a041129a98a7bf1 (golang:1.12.14-buster)
Tagging golang:1.12.14-buster
Tagging golang:1.12-buster
Tagging golang:1.12.14
Tagging golang:1.12
$ test/run.sh golang:1.12.14-buster
testing golang:1.12.14-buster
'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.12.14-stretch
Using bashbrew/cache:d2c82911c58f54d16603bc9e98df5970005eeec43e4ffea58e5dd3e36f7d0344 (golang:1.12.14-stretch)
Tagging golang:1.12.14-stretch
Tagging golang:1.12-stretch
$ test/run.sh golang:1.12.14-stretch
testing golang:1.12.14-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.12.14-alpine3.11
Building bashbrew/cache:c672d1ca107c73e2a102d3335e710d4e9ba93e9f6b07b261853639beb2679d1f (golang:1.12.14-alpine3.11)
Tagging golang:1.12.14-alpine3.11
Tagging golang:1.12-alpine3.11
Tagging golang:1.12.14-alpine
Tagging golang:1.12-alpine
$ test/run.sh golang:1.12.14-alpine3.11
testing golang:1.12.14-alpine3.11
'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.12.14-alpine3.10
Building bashbrew/cache:a047a0f4b85cb7f1e63dceb3e87ad0cb6faeafae977c604c842f433076d3e7aa (golang:1.12.14-alpine3.10)
Tagging golang:1.12.14-alpine3.10
Tagging golang:1.12-alpine3.10
$ test/run.sh golang:1.12.14-alpine3.10
testing golang:1.12.14-alpine3.10
'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.12.14-windowsservercore-ltsc2016
skipping "golang:1.12.14-windowsservercore-ltsc2016" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh golang:1.12.14-windowsservercore-ltsc2016
testing golang:1.12.14-windowsservercore-ltsc2016
image has no tests...skipping
$ bashbrew build golang:1.12.14-windowsservercore-1809
skipping "golang:1.12.14-windowsservercore-1809" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh golang:1.12.14-windowsservercore-1809
testing golang:1.12.14-windowsservercore-1809
image has no tests...skipping
$ bashbrew build golang:1.12.14-nanoserver-1809
skipping "golang:1.12.14-nanoserver-1809" (due to architecture "amd64"; only "windows-amd64" supported)
$ test/run.sh golang:1.12.14-nanoserver-1809
testing golang:1.12.14-nanoserver-1809
image has no tests...skipping
|
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.
Changes: