kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Bump go version to 1.10.2

Browse source 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff 2018-05-01 13:40:27 -04:00
parent 57493cd606
commit 9e5bebb1f5
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -32,10 +32,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.1 AS base FROM golang:1.10.2 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.1 ENV GO_VERSION 1.10.2
# 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

2
Dockerfile.e2e
View file

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

2
Dockerfile.simple
View file

@ -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.1 ENV GO_VERSION 1.10.2
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

2
Dockerfile.windows
View file

@ -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.1 ` ENV GO_VERSION=1.10.2 `
GIT_VERSION=2.11.1 ` GIT_VERSION=2.11.1 `
GOPATH=C:\go ` GOPATH=C:\go `
FROM_DOCKERFILE=1 FROM_DOCKERFILE=1