Use Go 1.13

Signed-off-by: Nicolas De Loof <[email protected]>

Author: ndeloof

Dockerfile

@@ -1,4 +1,4 @@
-FROM dockercore/golang-cross:1.12.9@sha256:3ea9dcef4dd2c46d80445c0b22d6177817f4cfce22c523cc12a5a1091cb37705 AS build
+FROM dockercore/golang-cross:1.12.9@sha256:3ea9dcef4dd2c46d80445c0b22d6177817f4cfce22c523cc12a5a1091cb37705 AS cli-build
 ENV     DISABLE_WARN_OUTSIDE_CONTAINER=1
 
 RUN apt-get install -y -q --no-install-recommends \
@@ -11,13 +11,19 @@ WORKDIR /go/src/github.com/docker/cli
 RUN git clone https://github.com/docker/cli . && git checkout a1b83ffd2cbeefc0752e5aa7a543d49c1ddfd2cb
 
 ARG GOPROXY
-RUN make binary-osx binary-windows binary && \
-  cp build/docker-linux-amd64 /usr/bin/docker
+RUN make binary-osx binary-windows binary
+
+# main dev image
+FROM golang:1.13.3 AS dev
+
+RUN apt-get update && apt-get install -y -q --no-install-recommends \
+  coreutils \
+  util-linux \
+  uuid-runtime
 
 WORKDIR /go/src/github.com/docker/app/
+COPY --from=cli-build /go/src/github.com/docker/cli/build/docker-linux-amd64 /usr/bin/docker
 
-# main dev image
-FROM build AS dev
 ENV PATH=${PATH}:/go/src/github.com/docker/app/bin/
 ARG DEP_VERSION=v0.5.4
 RUN curl -o /usr/bin/dep -L https://github.com/golang/dep/releases/download/${DEP_VERSION}/dep-linux-amd64 && \
@@ -44,9 +50,9 @@ RUN go get -d gopkg.in/mjibson/esc.v0 && \
 COPY . .
 
 FROM scratch AS cli
-COPY --from=build /go/src/github.com/docker/cli/build/docker-linux-amd64 docker-linux
-COPY --from=build /go/src/github.com/docker/cli/build/docker-darwin-amd64 docker-darwin
-COPY --from=build /go/src/github.com/docker/cli/build/docker-windows-amd64 docker-windows.exe
+COPY --from=cli-build /go/src/github.com/docker/cli/build/docker-linux-amd64 docker-linux
+COPY --from=cli-build /go/src/github.com/docker/cli/build/docker-darwin-amd64 docker-darwin
+COPY --from=cli-build /go/src/github.com/docker/cli/build/docker-windows-amd64 docker-windows.exe
 
 FROM dev AS cross-build
 ARG TAG="unknown"

Dockerfile.invocation-image

@@ -1,6 +1,6 @@
-ARG ALPINE_VERSION=3.10.1
+ARG ALPINE_VERSION=3.10.3
 
-FROM golang:1.13.0 AS build
+FROM golang:1.13.2 AS build
 
 RUN apt-get update -qq && apt-get install -y -q --no-install-recommends \
   coreutils \

Jenkinsfile

@@ -1,4 +1,4 @@
-pipeline {
+    pipeline {
     agent none
 
     options {

e2e/testdata/cnab-parameters/cnab/build/Dockerfile

@@ -1,4 +1,4 @@
-ARG ALPINE_VERSION=3.10.1
+ARG ALPINE_VERSION=3.10.3
 
 FROM alpine:${ALPINE_VERSION}
 

e2e/testdata/cnab-with-docker-status/cnab/build/Dockerfile

@@ -1,4 +1,4 @@
-ARG ALPINE_VERSION=3.10.1
+ARG ALPINE_VERSION=3.10.3
 
 FROM alpine:${ALPINE_VERSION}
 

e2e/testdata/cnab-with-standard-status/cnab/build/Dockerfile

@@ -1,4 +1,4 @@
-ARG ALPINE_VERSION=3.10.1
+ARG ALPINE_VERSION=3.10.3
 
 FROM alpine:${ALPINE_VERSION}
 

vars.mk

@@ -6,7 +6,7 @@ E2E_NAME := $(BIN_NAME)-e2e
 BUILD_ANALYZER?=dockereng/fossa-analyzer:1.0.10
 FOSSA_OPTS?=--option all-tags:true --option allow-unresolved:true
 
-ALPINE_VERSION=3.10.1
+ALPINE_VERSION=3.10.3
 
 # Failing to resolve sh.exe to a full path denotes a windows vanilla shell.
 # Although 'simple' commands are still exec'ed, 'complex' ones are batch'ed instead of sh'ed.