Browse Source

Merge pull request #147 from thaJeztah/18.09_bump_golang_1.10.8

[18.09] Bump Golang 1.10.8 (CVE-2019-6486)
Andrew Hsu 6 years ago
parent
commit
02b07d4ede
4 changed files with 5 additions and 5 deletions
  1. 2 2
      Dockerfile
  2. 1 1
      Dockerfile.e2e
  3. 1 1
      Dockerfile.simple
  4. 1 1
      Dockerfile.windows

+ 2 - 2
Dockerfile

@@ -24,10 +24,10 @@
 # the case. Therefore, you don't have to disable it anymore.
 # the case. Therefore, you don't have to disable it anymore.
 #
 #
 
 
-FROM golang:1.10.6 AS base
+FROM golang:1.10.8 AS base
 # FIXME(vdemeester) this is kept for other script depending on it to not fail right away
 # FIXME(vdemeester) this is kept for other script depending on it to not fail right away
 # Remove this once the other scripts uses something else to detect the version
 # Remove this once the other scripts uses something else to detect the version
-ENV GO_VERSION 1.10.6
+ENV GO_VERSION 1.10.8
 # 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 - 1
Dockerfile.e2e

@@ -1,5 +1,5 @@
 ## Step 1: Build tests
 ## Step 1: Build tests
-FROM golang:1.10.6-alpine3.7 as builder
+FROM golang:1.10.8-alpine3.7 as builder
 
 
 RUN apk add --update \
 RUN apk add --update \
     bash \
     bash \

+ 1 - 1
Dockerfile.simple

@@ -42,7 +42,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 #            will need updating, to avoid errors. Ping #docker-maintainers on IRC
 #            will need updating, to avoid errors. Ping #docker-maintainers on IRC
 #            with a heads-up.
 #            with a heads-up.
 # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored
 # IMPORTANT: When updating this please note that stdlib archive/tar pkg is vendored
-ENV GO_VERSION 1.10.6
+ENV GO_VERSION 1.10.8
 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" \
 RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" \
 	| tar -xzC /usr/local
 	| tar -xzC /usr/local
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV PATH /go/bin:/usr/local/go/bin:$PATH

+ 1 - 1
Dockerfile.windows

@@ -161,7 +161,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.10.6 `
+ENV GO_VERSION=1.10.8 `
     GIT_VERSION=2.11.1 `
     GIT_VERSION=2.11.1 `
     GOPATH=C:\go `
     GOPATH=C:\go `
     FROM_DOCKERFILE=1
     FROM_DOCKERFILE=1