mirror of https://github.com/docker/cli.git
Merge pull request #1585 from thaJeztah/bump_golang_1.11.4
Bump Golang 1.11.4 (includes fix for CVE-2018-16875)
This commit is contained in:
commit
0d4a858052
|
@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
GOPATH: c:\gopath
|
GOPATH: c:\gopath
|
||||||
GOVERSION: 1.11.2
|
GOVERSION: 1.11.4
|
||||||
DEPVERSION: v0.4.1
|
DEPVERSION: v0.4.1
|
||||||
|
|
||||||
install:
|
install:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM golang:1.11.2-alpine
|
FROM golang:1.11.4-alpine
|
||||||
|
|
||||||
RUN apk add -U git bash coreutils gcc musl-dev
|
RUN apk add -U git bash coreutils gcc musl-dev
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM dockercore/golang-cross:1.11.2@sha256:7e8945e30dae5d6455a3e75e5091e642f79110301a86d08f8c93991518e930b3
|
FROM dockercore/golang-cross:1.11.4@sha256:9e5f0013a7dbc49b6726267577803202b403be1a560c0c03c4e215d7e2476b1b
|
||||||
ENV DISABLE_WARN_OUTSIDE_CONTAINER=1
|
ENV DISABLE_WARN_OUTSIDE_CONTAINER=1
|
||||||
WORKDIR /go/src/github.com/docker/cli
|
WORKDIR /go/src/github.com/docker/cli
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM golang:1.11.2-alpine
|
FROM golang:1.11.4-alpine
|
||||||
|
|
||||||
RUN apk add -U git make bash coreutils ca-certificates curl
|
RUN apk add -U git make bash coreutils ca-certificates curl
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
ARG GO_VERSION=1.11.2
|
ARG GO_VERSION=1.11.4
|
||||||
|
|
||||||
FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process
|
FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
FROM golang:1.11.2-alpine
|
FROM golang:1.11.4-alpine
|
||||||
|
|
||||||
RUN apk add -U git
|
RUN apk add -U git
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue