Merge pull request #20 from gcpug/1.16

sonatard · web-flow · commit 06e361f59bf0 · 2021-08-18T13:02:34.000+09:00
Go 1.16
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -9,14 +9,14 @@ on:
 
 env:
   IMAGE_ID: ghcr.io/${{ github.repository_owner }}/appengine-go
-  LATEST_VERSION: 1.15
+  LATEST_VERSION: 1.16
 
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [1.15, 1.14, 1.13, 1.11]
+        version: [1.16, 1.15, 1.14, 1.13, 1.11]
         os: [debian, slim, alpine]
     steps:
       - uses: actions/checkout@v2
@@ -31,7 +31,7 @@ jobs:
 
     strategy:
       matrix:
-        version: [1.15, 1.14, 1.13, 1.11]
+        version: [1.16, 1.15, 1.14, 1.13, 1.11]
         os: [debian, slim, alpine]
     steps:
       - uses: actions/checkout@v2
@@ -80,7 +80,7 @@ jobs:
 
     strategy:
       matrix:
-        version: [1.15, 1.14, 1.13, 1.11]
+        version: [1.16, 1.15, 1.14, 1.13, 1.11]
     steps:
       - uses: actions/checkout@v2
 
diff --git a/1.11/alpine/Dockerfile b/1.11/alpine/Dockerfile
@@ -16,13 +16,7 @@ RUN apk add --no-cache \
     gcloud components install \
 		app-engine-go \
 		beta && \
-    chmod +x \
-		/google-cloud-sdk/platform/google_appengine/appcfg.py \
-		/google-cloud-sdk/platform/google_appengine/backends_conversion.py \
-		/google-cloud-sdk/platform/google_appengine/bulkload_client.py \
-		/google-cloud-sdk/platform/google_appengine/bulkloader.py \
-		/google-cloud-sdk/platform/google_appengine/download_appstats.py \
-		/google-cloud-sdk/platform/google_appengine/endpointscfg.py && \
+    chmod +x /google-cloud-sdk/platform/google_appengine/*.py && \
     \
     curl -o go.tgz -sSL "https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \
     echo "${GOLANG_DOWNLOAD_SHA256} *go.tgz" | sha256sum -c - && \
diff --git a/1.13/alpine/Dockerfile b/1.13/alpine/Dockerfile
@@ -16,13 +16,7 @@ RUN apk add --no-cache \
     gcloud components install \
 		app-engine-go \
 		beta && \
-    chmod +x \
-		/google-cloud-sdk/platform/google_appengine/appcfg.py \
-		/google-cloud-sdk/platform/google_appengine/backends_conversion.py \
-		/google-cloud-sdk/platform/google_appengine/bulkload_client.py \
-		/google-cloud-sdk/platform/google_appengine/bulkloader.py \
-		/google-cloud-sdk/platform/google_appengine/download_appstats.py \
-		/google-cloud-sdk/platform/google_appengine/endpointscfg.py && \
+    chmod +x /google-cloud-sdk/platform/google_appengine/*.py && \
     \
     curl -o go.tgz -sSL "https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \
     echo "${GOLANG_DOWNLOAD_SHA256} *go.tgz" | sha256sum -c - && \
diff --git a/1.14/alpine/Dockerfile b/1.14/alpine/Dockerfile
@@ -16,13 +16,7 @@ RUN apk add --no-cache \
     gcloud components install \
 		app-engine-go \
 		beta && \
-    chmod +x \
-		/google-cloud-sdk/platform/google_appengine/appcfg.py \
-		/google-cloud-sdk/platform/google_appengine/backends_conversion.py \
-		/google-cloud-sdk/platform/google_appengine/bulkload_client.py \
-		/google-cloud-sdk/platform/google_appengine/bulkloader.py \
-		/google-cloud-sdk/platform/google_appengine/download_appstats.py \
-		/google-cloud-sdk/platform/google_appengine/endpointscfg.py && \
+    chmod +x /google-cloud-sdk/platform/google_appengine/*.py && \
     \
     curl -o go.tgz -sSL "https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \
     echo "${GOLANG_DOWNLOAD_SHA256} *go.tgz" | sha256sum -c - && \
diff --git a/1.15/alpine/Dockerfile b/1.15/alpine/Dockerfile
@@ -4,8 +4,8 @@ LABEL maintainer "GCPUG <https://gcpug.jp/>"
 ENV GOPATH=/go \
 	PATH=/go/bin:/usr/local/go/bin:/google-cloud-sdk/bin:/google-cloud-sdk/platform/google_appengine:$PATH
 
-ARG GOLANG_VERSION=1.15.8
-ARG GOLANG_DOWNLOAD_SHA256=d3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b
+ARG GOLANG_VERSION=1.15.14
+ARG GOLANG_DOWNLOAD_SHA256=6f5410c113b803f437d7a1ee6f8f124100e536cc7361920f7e640fedf7add72d
 
 RUN apk add --no-cache \
         gcc \
@@ -16,13 +16,7 @@ RUN apk add --no-cache \
     gcloud components install \
 		app-engine-go \
 		beta && \
-    chmod +x \
-		/google-cloud-sdk/platform/google_appengine/appcfg.py \
-		/google-cloud-sdk/platform/google_appengine/backends_conversion.py \
-		/google-cloud-sdk/platform/google_appengine/bulkload_client.py \
-		/google-cloud-sdk/platform/google_appengine/bulkloader.py \
-		/google-cloud-sdk/platform/google_appengine/download_appstats.py \
-		/google-cloud-sdk/platform/google_appengine/endpointscfg.py && \
+    chmod +x /google-cloud-sdk/platform/google_appengine/*.py && \
     \
     curl -o go.tgz -sSL "https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \
     echo "${GOLANG_DOWNLOAD_SHA256} *go.tgz" | sha256sum -c - && \
diff --git a/1.15/debian/Dockerfile b/1.15/debian/Dockerfile
@@ -5,8 +5,8 @@ ARG GOPATH=/go
 ENV GOPATH=${GOPATH} \
 	PATH=/go/bin:/usr/local/go/bin:$PATH
 
-ARG GOLANG_VERSION=1.15.8
-ARG GOLANG_DOWNLOAD_SHA256=d3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b
+ARG GOLANG_VERSION=1.15.14
+ARG GOLANG_DOWNLOAD_SHA256=6f5410c113b803f437d7a1ee6f8f124100e536cc7361920f7e640fedf7add72d
 
 RUN set -eux && \
 	apt-get update && \
diff --git a/1.15/slim/Dockerfile b/1.15/slim/Dockerfile
@@ -5,8 +5,8 @@ ARG GOPATH=/go
 ENV GOPATH=${GOPATH} \
 	PATH=/go/bin:/usr/local/go/bin:$PATH
 
-ARG GOLANG_VERSION=1.15.8
-ARG GOLANG_DOWNLOAD_SHA256=d3379c32a90fdf9382166f8f48034c459a8cc433730bc9476d39d9082c94583b
+ARG GOLANG_VERSION=1.15.14
+ARG GOLANG_DOWNLOAD_SHA256=6f5410c113b803f437d7a1ee6f8f124100e536cc7361920f7e640fedf7add72d
 
 RUN set -eux && \
 	apt-get update && \
diff --git a/1.16/alpine/Dockerfile b/1.16/alpine/Dockerfile
@@ -0,0 +1,26 @@
+FROM google/cloud-sdk:alpine
+LABEL maintainer "GCPUG <https://gcpug.jp/>"
+
+ENV GOPATH=/go \
+	PATH=/go/bin:/usr/local/go/bin:/google-cloud-sdk/bin:/google-cloud-sdk/platform/google_appengine:$PATH
+
+ARG GOLANG_VERSION=1.16.7
+ARG GOLANG_DOWNLOAD_SHA256=7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04
+
+RUN apk add --no-cache \
+        gcc \
+        libc-dev \
+        make \
+        unzip && \
+    \
+    gcloud components install \
+		app-engine-go \
+		beta && \
+    chmod +x /google-cloud-sdk/platform/google_appengine/*.py && \
+    \
+    curl -o go.tgz -sSL "https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \
+    echo "${GOLANG_DOWNLOAD_SHA256} *go.tgz" | sha256sum -c - && \
+    tar -C /usr/local -xzf go.tgz && \
+    rm go.tgz
+
+VOLUME ["/root/.config"]
diff --git a/1.16/debian/Dockerfile b/1.16/debian/Dockerfile
@@ -0,0 +1,25 @@
+FROM google/cloud-sdk:latest
+LABEL maintainer "GCPUG <https://gcpug.jp/>"
+
+ARG GOPATH=/go
+ENV GOPATH=${GOPATH} \
+	PATH=/go/bin:/usr/local/go/bin:$PATH
+
+ARG GOLANG_VERSION=1.16.7
+ARG GOLANG_DOWNLOAD_SHA256=7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04
+
+RUN set -eux && \
+	apt-get update && \
+	apt-get install -yqq --no-install-suggests --no-install-recommends \
+		libc6-dev \
+		make \
+		unzip && \
+	rm -rf /var/lib/apt/lists/* && \
+	\
+	curl -o go.tgz -sSL "https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \
+	echo "${GOLANG_DOWNLOAD_SHA256} *go.tgz" | sha256sum -c - && \
+	tar -C /usr/local -xzf go.tgz && \
+	rm go.tgz && \
+	mkdir ${GOPATH}
+
+VOLUME ["/root/.config"]
diff --git a/1.16/slim/Dockerfile b/1.16/slim/Dockerfile
@@ -0,0 +1,26 @@
+FROM google/cloud-sdk:slim
+LABEL maintainer "GCPUG <https://gcpug.jp/>"
+
+ARG GOPATH=/go
+ENV GOPATH=${GOPATH} \
+	PATH=/go/bin:/usr/local/go/bin:$PATH
+
+ARG GOLANG_VERSION=1.16.7
+ARG GOLANG_DOWNLOAD_SHA256=7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04
+
+RUN set -eux && \
+	apt-get update && \
+	apt-get install -yqq --no-install-suggests --no-install-recommends \
+        google-cloud-sdk-app-engine-go \
+		libc6-dev \
+		make \
+		unzip && \
+	rm -rf /var/lib/apt/lists/* && \
+	\
+	curl -o go.tgz -sSL "https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \
+	echo "${GOLANG_DOWNLOAD_SHA256} *go.tgz" | sha256sum -c - && \
+	tar -C /usr/local -xzf go.tgz && \
+	rm go.tgz && \
+	mkdir ${GOPATH}
+
+VOLUME ["/root/.config"]
diff --git a/README.md b/README.md
@@ -15,23 +15,44 @@ docker pull ghcr.io/gcpug/appengine-go:latest
 
 All images installed `go` runtime, `gcloud` SDK and following components with `gcloud` way.
 
+## Go 1.16
+
+- Version: 1.16.7
+- Base Image: [google/cloud-sdk](https://hub.docker.com/r/google/cloud-sdk/)
+
+- [`latest`](1.16/debian/Dockerfile), [`debian`](1.16/debian/Dockerfile), [`1.16`](1.16/debian/Dockerfile), [`1.16-debian`](1.16/debian/Dockerfile)
+  - Components
+    - appengine-go
+    - beta
+    - cloud-datastore-emulator
+    - emulator-reverse-proxy
+    - pubsub-emulator
+- [`slim`](1.16/slim/Dockerfile), [`1.16-slim`](1.16/slim/Dockerfile)
+  - Components
+    - appengine-go
+    - beta
+- [`alpine`](1.16/alpine/Dockerfile), [`1.16-alpine`](1.16/alpine/Dockerfile)
+  - Components
+    - appengine-go
+    - beta
+
 ## Go 1.15
 
-- Version: 1.15.8
+- Version: 1.15.14
 - Base Image: [google/cloud-sdk](https://hub.docker.com/r/google/cloud-sdk/)
 
-- [`latest`](1.15/debian/Dockerfile), [`debian`](1.15/debian/Dockerfile), [`1.15`](1.15/debian/Dockerfile), [`1.15-debian`](1.15/debian/Dockerfile)
+- [`1.15`](1.15/debian/Dockerfile), [`1.15-debian`](1.15/debian/Dockerfile)
   - Components
     - appengine-go
     - beta
     - cloud-datastore-emulator
     - emulator-reverse-proxy
     - pubsub-emulator
-- [`slim`](1.15/slim/Dockerfile), [`1.15-slim`](1.15/slim/Dockerfile)
+- [`1.15-slim`](1.15/slim/Dockerfile)
   - Components
     - appengine-go
     - beta
-- [`alpine`](1.15/alpine/Dockerfile), [`1.15-alpine`](1.15/alpine/Dockerfile)
+- [`1.15-alpine`](1.15/alpine/Dockerfile)
   - Components
     - appengine-go
     - beta
