Bump Golang 1.12.5
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
(cherry picked from commit 3a4c5b6a0d
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
14bb71d508
commit
6d0823af0a
|
@ -26,7 +26,7 @@
|
||||||
|
|
||||||
ARG CROSS="false"
|
ARG CROSS="false"
|
||||||
|
|
||||||
FROM golang:1.12.4 AS base
|
FROM golang:1.12.5 AS base
|
||||||
# allow replacing httpredir or deb mirror
|
# allow replacing httpredir or deb mirror
|
||||||
ARG APT_MIRROR=deb.debian.org
|
ARG APT_MIRROR=deb.debian.org
|
||||||
RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
|
RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM golang:1.12.4-alpine as base
|
FROM golang:1.12.5-alpine as base
|
||||||
|
|
||||||
RUN apk --no-cache add \
|
RUN apk --no-cache add \
|
||||||
bash \
|
bash \
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
# This represents the bare minimum required to build and test Docker.
|
# This represents the bare minimum required to build and test Docker.
|
||||||
|
|
||||||
FROM golang:1.12.4
|
FROM golang:1.12.5
|
||||||
|
|
||||||
# allow replacing httpredir or deb mirror
|
# allow replacing httpredir or deb mirror
|
||||||
ARG APT_MIRROR=deb.debian.org
|
ARG APT_MIRROR=deb.debian.org
|
||||||
|
|
|
@ -168,7 +168,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
|
||||||
# Environment variable notes:
|
# Environment variable notes:
|
||||||
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
|
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
|
||||||
# - FROM_DOCKERFILE is used for detection of building within a container.
|
# - FROM_DOCKERFILE is used for detection of building within a container.
|
||||||
ENV GO_VERSION=1.12.4 `
|
ENV GO_VERSION=1.12.5 `
|
||||||
GIT_VERSION=2.11.1 `
|
GIT_VERSION=2.11.1 `
|
||||||
GOPATH=C:\go `
|
GOPATH=C:\go `
|
||||||
FROM_DOCKERFILE=1
|
FROM_DOCKERFILE=1
|
||||||
|
|
Loading…
Reference in New Issue