mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #39063 from tao12345666333/bump-golang-1.12.4
Bump Golang 1.12.4
This commit is contained in:
commit
9b2eaa8a5d
4 changed files with 4 additions and 4 deletions
|
@ -26,7 +26,7 @@
|
|||
|
||||
ARG CROSS="false"
|
||||
|
||||
FROM golang:1.12.3 AS base
|
||||
FROM golang:1.12.4 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
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
## Step 1: Build tests
|
||||
FROM golang:1.12.3-alpine as builder
|
||||
FROM golang:1.12.4-alpine as builder
|
||||
|
||||
RUN apk --no-cache add \
|
||||
bash \
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
# This represents the bare minimum required to build and test Docker.
|
||||
|
||||
FROM golang:1.12.3
|
||||
FROM golang:1.12.4
|
||||
|
||||
# allow replacing httpredir or deb mirror
|
||||
ARG APT_MIRROR=deb.debian.org
|
||||
|
|
|
@ -168,7 +168,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.12.3 `
|
||||
ENV GO_VERSION=1.12.4 `
|
||||
GIT_VERSION=2.11.1 `
|
||||
GOPATH=C:\go `
|
||||
FROM_DOCKERFILE=1
|
||||
|
|
Loading…
Reference in a new issue