mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	Bump Golang 1.11.4
go1.11.4 (released 2018/12/14) includes fixes to cgo, the compiler, linker, runtime, documentation, go command, and the net/http and go/types packages. It includes a fix to a bug introduced in Go 1.11.3 that broke go get for import path patterns containing "...". See the Go 1.11.4 milestone for details: https://github.com/golang/go/issues?q=milestone%3AGo1.11.4+label%3ACherryPickApproved Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
		
							parent
							
								
									bcd817ee6b
								
							
						
					
					
						commit
						3770f38647
					
				
					 4 changed files with 4 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -24,7 +24,7 @@
 | 
			
		|||
# the case. Therefore, you don't have to disable it anymore.
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
FROM golang:1.11.3 AS base
 | 
			
		||||
FROM golang:1.11.4 AS base
 | 
			
		||||
# allow replacing httpredir or deb mirror
 | 
			
		||||
ARG APT_MIRROR=deb.debian.org
 | 
			
		||||
RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,5 @@
 | 
			
		|||
## Step 1: Build tests
 | 
			
		||||
FROM golang:1.11.3-alpine3.7 as builder
 | 
			
		||||
FROM golang:1.11.4-alpine3.7 as builder
 | 
			
		||||
 | 
			
		||||
RUN apk --no-cache add \
 | 
			
		||||
    bash \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,7 +5,7 @@
 | 
			
		|||
 | 
			
		||||
# This represents the bare minimum required to build and test Docker.
 | 
			
		||||
 | 
			
		||||
FROM golang:1.11.3-stretch
 | 
			
		||||
FROM golang:1.11.4-stretch
 | 
			
		||||
 | 
			
		||||
# allow replacing httpredir or deb mirror
 | 
			
		||||
ARG APT_MIRROR=deb.debian.org
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -161,7 +161,7 @@ SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPref
 | 
			
		|||
# Environment variable notes:
 | 
			
		||||
#  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
 | 
			
		||||
#  - FROM_DOCKERFILE is used for detection of building within a container.
 | 
			
		||||
ENV GO_VERSION=1.11.3 `
 | 
			
		||||
ENV GO_VERSION=1.11.4 `
 | 
			
		||||
    GIT_VERSION=2.11.1 `
 | 
			
		||||
    GOPATH=C:\go `
 | 
			
		||||
    FROM_DOCKERFILE=1
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue