1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #38143 from thaJeztah/bump_golang_1.11.2

Bump Golang to 1.11.2
This commit is contained in:
Sebastiaan van Stijn 2018-11-06 21:14:52 +01:00 committed by GitHub
commit 2f902930e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View file

@ -24,7 +24,7 @@
# the case. Therefore, you don't have to disable it anymore.
#
FROM golang:1.11.1 AS base
FROM golang:1.11.2 AS base
# allow replacing httpredir or deb mirror
ARG APT_MIRROR=deb.debian.org
RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list

View file

@ -1,5 +1,5 @@
## Step 1: Build tests
FROM golang:1.11.1-alpine3.7 as builder
FROM golang:1.11.2-alpine3.7 as builder
RUN apk --no-cache add \
bash \

View file

@ -5,7 +5,7 @@
# This represents the bare minimum required to build and test Docker.
FROM golang:1.11.1-stretch
FROM golang:1.11.2-stretch
# allow replacing httpredir or deb mirror
ARG APT_MIRROR=deb.debian.org

View file

@ -161,7 +161,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
# Environment variable notes:
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
# - FROM_DOCKERFILE is used for detection of building within a container.
ENV GO_VERSION=1.11.1 `
ENV GO_VERSION=1.11.2 `
GIT_VERSION=2.11.1 `
GOPATH=C:\go `
FROM_DOCKERFILE=1