Bump to 1.4

tianon · tianon · commit dc0571dad14f · 2014-12-11T11:33:20.000-07:00
diff --git a/1.4/Dockerfile b/1.4/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y \
 		--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.4rc2
+ENV GOLANG_VERSION 1.4
 
 RUN curl -sSL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \
 		| tar -v -C /usr/src -xz
diff --git a/1.4/cross/Dockerfile b/1.4/cross/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.4rc2
+FROM golang:1.4.0
 
 # see https://golang.org/doc/install/source#environment
 # see also http://build.golang.org/
diff --git a/1.4/onbuild/Dockerfile b/1.4/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.4rc2
+FROM golang:1.4.0
 
 RUN mkdir -p /go/src/app
 WORKDIR /go/src/app
diff --git a/1.4/wheezy/Dockerfile b/1.4/wheezy/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && apt-get install -y \
 		--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV GOLANG_VERSION 1.4rc2
+ENV GOLANG_VERSION 1.4
 
 RUN curl -sSL https://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \
 		| tar -v -C /usr/src -xz
diff --git a/update.sh b/update.sh
@@ -10,7 +10,7 @@ fi
 versions=( "${versions[@]%/}" )
 
 for version in "${versions[@]}"; do
-	fullVersion="$(curl -sSL 'https://golang.org/dl' | grep '">go'"$version"'.*\.src.tar.gz<' | sed -r 's!.*go([^"/<]+)\.src\.tar\.gz.*!\1!' | sort -V | tail -1)"
+	fullVersion="$(curl -sSL 'https://golang.org/dl' | grep '">go'"$version"'.*\.src.tar.gz<' | sed -r 's!.*go([^"/<]+)\.src\.tar\.gz.*!\1!' | grep -vE 'rc|beta' | sort -V | tail -1)"
 	versionTag="$fullVersion"
 	[[ "$versionTag" == *.*[^0-9]* ]] || versionTag+='.0'
 	(

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.4rc2`
	`1`	`+FROM golang:1.4.0`
`2`	`2`
`3`	`3`	`# see https://golang.org/doc/install/source#environment`
`4`	`4`	`# see also http://build.golang.org/`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ fi`
`10`	`10`	`versions=( "${versions[@]%/}" )`
`11`	`11`
`12`	`12`	`for version in "${versions[@]}"; do`
`13`		`- fullVersion="$(curl -sSL 'https://golang.org/dl' \| grep '">go'"$version"'.\.src.tar.gz<' \| sed -r 's!.go([^"/<]+)\.src\.tar\.gz.*!\1!' \| sort -V \| tail -1)"`
	`13`	`+ fullVersion="$(curl -sSL 'https://golang.org/dl' \| grep '">go'"$version"'.\.src.tar.gz<' \| sed -r 's!.go([^"/<]+)\.src\.tar\.gz.*!\1!' \| grep -vE 'rc\|beta' \| sort -V \| tail -1)"`
`14`	`14`	`versionTag="$fullVersion"`
`15`	`15`	`[[ "$versionTag" == .[^0-9]* ]] \|\| versionTag+='.0'`
`16`	`16`	`(`