From 3ed57e01a6ee3f52c9f7708e9445b1754e5d7046 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 3 Sep 2019 12:18:03 +0200 Subject: [PATCH] Update go version to go 1.13rc2 --- .semaphoreci/setup.sh | 2 +- build.Dockerfile | 2 +- docs/content/contributing/building-testing.md | 2 +- exp.Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.semaphoreci/setup.sh b/.semaphoreci/setup.sh index 568eea2fc..2fa285763 100755 --- a/.semaphoreci/setup.sh +++ b/.semaphoreci/setup.sh @@ -21,7 +21,7 @@ if [ -n "$SHOULD_TEST" ]; then docker version; fi export GO_VERSION=1.12 if [ -f "./go.mod" ]; then GO_VERSION="$(grep '^go .*' go.mod | awk '{print $2}')"; export GO_VERSION; fi -if [ "${GO_VERSION}" == '1.13' ]; then export GO_VERSION=1.13rc1; fi +if [ "${GO_VERSION}" == '1.13' ]; then export GO_VERSION=1.13rc2; fi echo "Selected Go version: ${GO_VERSION}" if [ -f "./.semaphoreci/golang.sh" ]; then ./.semaphoreci/golang.sh; fi diff --git a/build.Dockerfile b/build.Dockerfile index 27c308562..1fe4290eb 100644 --- a/build.Dockerfile +++ b/build.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13rc1-alpine +FROM golang:1.13rc2-alpine RUN apk --update upgrade \ && apk --no-cache --no-progress add git mercurial bash gcc musl-dev curl tar ca-certificates tzdata \ diff --git a/docs/content/contributing/building-testing.md b/docs/content/contributing/building-testing.md index 95b713490..e165fbdcb 100644 --- a/docs/content/contributing/building-testing.md +++ b/docs/content/contributing/building-testing.md @@ -28,7 +28,7 @@ Successfully tagged traefik-webui:latest [...] docker build -t "traefik-dev:4475--feature-documentation" -f build.Dockerfile . Sending build context to Docker daemon 279MB -Step 1/10 : FROM golang:1.13rc1-alpine +Step 1/10 : FROM golang:1.13rc2-alpine ---> f4bfb3d22bda [...] Successfully built 5c3c1a911277 diff --git a/exp.Dockerfile b/exp.Dockerfile index 6f59b73e3..319742177 100644 --- a/exp.Dockerfile +++ b/exp.Dockerfile @@ -12,7 +12,7 @@ RUN yarn install RUN npm run build # BUILD -FROM golang:1.13rc1-alpine as gobuild +FROM golang:1.13rc2-alpine as gobuild RUN apk --update upgrade \ && apk --no-cache --no-progress add git mercurial bash gcc musl-dev curl tar ca-certificates tzdata \