Skip to content

Commit b36d0fe

Browse files
committed
Add Go 1.16
1 parent 8811f17 commit b36d0fe

File tree

5 files changed

+111
-7
lines changed

5 files changed

+111
-7
lines changed

.github/workflows/docker-publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ on:
99

1010
env:
1111
IMAGE_ID: ghcr.io/${{ github.repository_owner }}/appengine-go
12-
LATEST_VERSION: 1.15
12+
LATEST_VERSION: 1.16
1313

1414
jobs:
1515
test:
1616
runs-on: ubuntu-latest
1717
strategy:
1818
matrix:
19-
version: [1.15, 1.14, 1.13, 1.11]
19+
version: [1.16, 1.15, 1.14, 1.13, 1.11]
2020
os: [debian, slim, alpine]
2121
steps:
2222
- uses: actions/checkout@v2
@@ -31,7 +31,7 @@ jobs:
3131

3232
strategy:
3333
matrix:
34-
version: [1.15, 1.14, 1.13, 1.11]
34+
version: [1.16, 1.15, 1.14, 1.13, 1.11]
3535
os: [debian, slim, alpine]
3636
steps:
3737
- uses: actions/checkout@v2
@@ -80,7 +80,7 @@ jobs:
8080

8181
strategy:
8282
matrix:
83-
version: [1.15, 1.14, 1.13, 1.11]
83+
version: [1.16, 1.15, 1.14, 1.13, 1.11]
8484
steps:
8585
- uses: actions/checkout@v2
8686

1.16/alpine/Dockerfile

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
FROM google/cloud-sdk:alpine
2+
LABEL maintainer "GCPUG <https://gcpug.jp/>"
3+
4+
ENV GOPATH=/go \
5+
PATH=/go/bin:/usr/local/go/bin:/google-cloud-sdk/bin:/google-cloud-sdk/platform/google_appengine:$PATH
6+
7+
ARG GOLANG_VERSION=1.16.7
8+
ARG GOLANG_DOWNLOAD_SHA256=7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04
9+
10+
RUN apk add --no-cache \
11+
gcc \
12+
libc-dev \
13+
make \
14+
unzip && \
15+
\
16+
gcloud components install \
17+
app-engine-go \
18+
beta && \
19+
chmod +x \
20+
/google-cloud-sdk/platform/google_appengine/appcfg.py \
21+
/google-cloud-sdk/platform/google_appengine/backends_conversion.py \
22+
/google-cloud-sdk/platform/google_appengine/bulkload_client.py \
23+
/google-cloud-sdk/platform/google_appengine/bulkloader.py \
24+
/google-cloud-sdk/platform/google_appengine/download_appstats.py \
25+
/google-cloud-sdk/platform/google_appengine/endpointscfg.py && \
26+
\
27+
curl -o go.tgz -sSL "https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \
28+
echo "${GOLANG_DOWNLOAD_SHA256} *go.tgz" | sha256sum -c - && \
29+
tar -C /usr/local -xzf go.tgz && \
30+
rm go.tgz
31+
32+
VOLUME ["/root/.config"]

1.16/debian/Dockerfile

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
FROM google/cloud-sdk:latest
2+
LABEL maintainer "GCPUG <https://gcpug.jp/>"
3+
4+
ARG GOPATH=/go
5+
ENV GOPATH=${GOPATH} \
6+
PATH=/go/bin:/usr/local/go/bin:$PATH
7+
8+
ARG GOLANG_VERSION=1.16.7
9+
ARG GOLANG_DOWNLOAD_SHA256=7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04
10+
11+
RUN set -eux && \
12+
apt-get update && \
13+
apt-get install -yqq --no-install-suggests --no-install-recommends \
14+
libc6-dev \
15+
make \
16+
unzip && \
17+
rm -rf /var/lib/apt/lists/* && \
18+
\
19+
curl -o go.tgz -sSL "https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \
20+
echo "${GOLANG_DOWNLOAD_SHA256} *go.tgz" | sha256sum -c - && \
21+
tar -C /usr/local -xzf go.tgz && \
22+
rm go.tgz && \
23+
mkdir ${GOPATH}
24+
25+
VOLUME ["/root/.config"]

1.16/slim/Dockerfile

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
FROM google/cloud-sdk:slim
2+
LABEL maintainer "GCPUG <https://gcpug.jp/>"
3+
4+
ARG GOPATH=/go
5+
ENV GOPATH=${GOPATH} \
6+
PATH=/go/bin:/usr/local/go/bin:$PATH
7+
8+
ARG GOLANG_VERSION=1.16.7
9+
ARG GOLANG_DOWNLOAD_SHA256=7fe7a73f55ba3e2285da36f8b085e5c0159e9564ef5f63ee0ed6b818ade8ef04
10+
11+
RUN set -eux && \
12+
apt-get update && \
13+
apt-get install -yqq --no-install-suggests --no-install-recommends \
14+
google-cloud-sdk-app-engine-go \
15+
libc6-dev \
16+
make \
17+
unzip && \
18+
rm -rf /var/lib/apt/lists/* && \
19+
\
20+
curl -o go.tgz -sSL "https://golang.org/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz" && \
21+
echo "${GOLANG_DOWNLOAD_SHA256} *go.tgz" | sha256sum -c - && \
22+
tar -C /usr/local -xzf go.tgz && \
23+
rm go.tgz && \
24+
mkdir ${GOPATH}
25+
26+
VOLUME ["/root/.config"]

README.md

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,44 @@ docker pull ghcr.io/gcpug/appengine-go:latest
1515

1616
All images installed `go` runtime, `gcloud` SDK and following components with `gcloud` way.
1717

18+
## Go 1.16
19+
20+
- Version: 1.16.7
21+
- Base Image: [google/cloud-sdk](https://hub.docker.com/r/google/cloud-sdk/)
22+
23+
- [`latest`](1.16/debian/Dockerfile), [`debian`](1.16/debian/Dockerfile), [`1.16`](1.16/debian/Dockerfile), [`1.16-debian`](1.16/debian/Dockerfile)
24+
- Components
25+
- appengine-go
26+
- beta
27+
- cloud-datastore-emulator
28+
- emulator-reverse-proxy
29+
- pubsub-emulator
30+
- [`slim`](1.16/slim/Dockerfile), [`1.16-slim`](1.16/slim/Dockerfile)
31+
- Components
32+
- appengine-go
33+
- beta
34+
- [`alpine`](1.16/alpine/Dockerfile), [`1.16-alpine`](1.16/alpine/Dockerfile)
35+
- Components
36+
- appengine-go
37+
- beta
38+
1839
## Go 1.15
1940

2041
- Version: 1.15.14
2142
- Base Image: [google/cloud-sdk](https://hub.docker.com/r/google/cloud-sdk/)
2243

23-
- [`latest`](1.15/debian/Dockerfile), [`debian`](1.15/debian/Dockerfile), [`1.15`](1.15/debian/Dockerfile), [`1.15-debian`](1.15/debian/Dockerfile)
44+
- [`1.15`](1.15/debian/Dockerfile), [`1.15-debian`](1.15/debian/Dockerfile)
2445
- Components
2546
- appengine-go
2647
- beta
2748
- cloud-datastore-emulator
2849
- emulator-reverse-proxy
2950
- pubsub-emulator
30-
- [`slim`](1.15/slim/Dockerfile), [`1.15-slim`](1.15/slim/Dockerfile)
51+
- [`1.15-slim`](1.15/slim/Dockerfile)
3152
- Components
3253
- appengine-go
3354
- beta
34-
- [`alpine`](1.15/alpine/Dockerfile), [`1.15-alpine`](1.15/alpine/Dockerfile)
55+
- [`1.15-alpine`](1.15/alpine/Dockerfile)
3556
- Components
3657
- appengine-go
3758
- beta

0 commit comments

Comments
 (0)