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

Merge pull request #39549 from thaJeztah/bump_go_1.13

Browse source 
Bump go 1.13.0
This commit is contained in:
Tibor Vass 2019-09-19 16:10:07 -07:00 • committed by GitHub
commit d49fa5354c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -25,13 +25,14 @@
# #
ARG CROSS="false" ARG CROSS="false"
ARG GO_VERSION=1.12.9 ARG GO_VERSION=1.13.0
ARG DEBIAN_FRONTEND=noninteractive ARG DEBIAN_FRONTEND=noninteractive
FROM golang:${GO_VERSION}-stretch AS base FROM golang:${GO_VERSION}-stretch AS base
ARG APT_MIRROR ARG APT_MIRROR
RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \ RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \
&& sed -ri "s/(security).debian.org/${APT_MIRROR:-security.debian.org}/g" /etc/apt/sources.list && sed -ri "s/(security).debian.org/${APT_MIRROR:-security.debian.org}/g" /etc/apt/sources.list
ENV GO111MODULE=off
FROM base AS criu FROM base AS criu
ARG DEBIAN_FRONTEND ARG DEBIAN_FRONTEND

4
Dockerfile.e2e
View file

@ -1,7 +1,7 @@
ARG GO_VERSION=1.12.9 ARG GO_VERSION=1.13.0
FROM golang:${GO_VERSION}-alpine AS base FROM golang:${GO_VERSION}-alpine AS base
ENV GO111MODULE=off
RUN apk --no-cache add \ RUN apk --no-cache add \
bash \ bash \
btrfs-progs-dev \ btrfs-progs-dev \

3
Dockerfile.simple
View file

@ -5,9 +5,10 @@
# This represents the bare minimum required to build and test Docker. # This represents the bare minimum required to build and test Docker.
ARG GO_VERSION=1.12.9 ARG GO_VERSION=1.13.0
FROM golang:${GO_VERSION}-stretch FROM golang:${GO_VERSION}-stretch
ENV GO111MODULE=off
# allow replacing httpredir or deb mirror # allow replacing httpredir or deb mirror
ARG APT_MIRROR=deb.debian.org ARG APT_MIRROR=deb.debian.org

3
Dockerfile.windows
View file

@ -165,7 +165,7 @@ FROM microsoft/windowsservercore
# Use PowerShell as the default shell # Use PowerShell as the default shell
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
ARG GO_VERSION=1.12.9 ARG GO_VERSION=1.13.0
# 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.
@ -173,6 +173,7 @@ ARG GO_VERSION=1.12.9
ENV GO_VERSION=${GO_VERSION} ` ENV GO_VERSION=${GO_VERSION} `
GIT_VERSION=2.11.1 ` GIT_VERSION=2.11.1 `
GOPATH=C:\gopath ` GOPATH=C:\gopath `
GO111MODULE=off `
FROM_DOCKERFILE=1 FROM_DOCKERFILE=1
RUN ` RUN `