Skip to content
This repository was archived by the owner on Feb 3, 2023. It is now read-only.

Commit 33f6bc5

Browse files
authored
Bump to golang v1.16.0, remove old 1.16beta handling (#31)
1 parent 61fccbf commit 33f6bc5

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

Dockerfile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
FROM golang:1.15.7-buster AS golang-base
2-
ENV GOLANGCI_LINT_VERSION v1.31.0
1+
FROM golang:1.16.0-buster AS golang-base
2+
ENV GOLANGCI_LINT_VERSION v1.36.0
33
ENV GOTESTSUM_VERSION 0.4.2
44
ENV PACKR2_VERSION 2.6.0
5-
ENV GOBETA=go1.16rc1
65

76
# npm install crashes with default buster npm, use current stable instead
87
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash -
@@ -44,7 +43,6 @@ ENV GOTOOLSTOBUILD \
4443
github.com/tsenart/deadcode \
4544
github.com/walle/lll \
4645
golang.org/x/tools/cmd/goimports \
47-
golang.org/dl/${GOBETA} \
4846
honnef.co/go/tools/cmd/staticcheck \
4947
github.com/client9/misspell/cmd/misspell
5048

@@ -55,8 +53,6 @@ RUN for item in $GOTOOLSTOBUILD; do \
5553
go get -u $item; \
5654
done
5755

58-
RUN ${GOBETA} download && ln -s /go/bin/${GOBETA} /go/bin/go1.16 && cp -r ~/sdk /sdk
59-
6056
# /go/bin will be mounted on top, so get everything into /usr/local/bin
6157
RUN cp -r /go/bin/* /usr/local/bin
6258

tests/golang-build-container/test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ set -eu -o pipefail
44
containerspec=$1
55

66
docker run --rm "${containerspec}" go version
7-
docker run --rm "${containerspec}" go1.16 version

0 commit comments

Comments
 (0)