Merge pull request #1 from infosiftr/standardize-dirs-and-update-to-go-1.3.1

yosifkit · yosifkit · commit 3c475b4c670e · 2014-08-13T09:35:56.000-06:00
Change directory structure to match other docker-library repos better, and bump from Go 1.3 to 1.3.1 which was released today
diff --git a/1.2/Dockerfile b/1.2/Dockerfile
@@ -6,7 +6,9 @@ RUN apt-get update && apt-get install -y \
 		bzr git mercurial \
 		--no-install-recommends
 
-RUN curl -sSL http://golang.org/dl/go1.2.2.src.tar.gz \
+ENV GOLANG_VERSION 1.2.2
+
+RUN curl -sSL http://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \
 	| tar -v -C /usr/src -xz
 WORKDIR /usr/src/go
 
diff --git a/1.2/cross/Dockerfile b/1.2/cross/Dockerfile
diff --git a/1.2/onbuild/Dockerfile b/1.2/onbuild/Dockerfile
diff --git a/1.3/Dockerfile b/1.3/Dockerfile
@@ -6,7 +6,9 @@ RUN apt-get update && apt-get install -y \
 		bzr git mercurial \
 		--no-install-recommends
 
-RUN curl -sSL http://golang.org/dl/go1.3.src.tar.gz \
+ENV GOLANG_VERSION 1.3.1
+
+RUN curl -sSL http://golang.org/dl/go$GOLANG_VERSION.src.tar.gz \
 	| tar -v -C /usr/src -xz
 WORKDIR /usr/src/go
 
diff --git a/1.3/cross/Dockerfile b/1.3/cross/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.3
+FROM golang:1.3.1
 
 # see http://golang.org/doc/install/source#environment
 # see also http://build.golang.org/
diff --git a/1.3/onbuild/Dockerfile b/1.3/onbuild/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.3
+FROM golang:1.3.1
 
 RUN mkdir -p /go/src/app
 WORKDIR /go/src/app
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
@@ -4,7 +4,6 @@ set -e
 declare -A aliases
 aliases=(
 	[1.3]='1 latest'
-	[1.2.2]='1.2'
 )
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
@@ -17,7 +16,8 @@ echo '# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)'
 
 for version in "${versions[@]}"; do
 	commit="$(git log -1 --format='format:%H' "$version")"
-	versionAliases=( $version ${aliases[$version]} )
+	fullVersion="$(grep -m1 'ENV GOLANG_VERSION ' "$version/Dockerfile" | cut -d' ' -f3)"
+	versionAliases=( $fullVersion $version ${aliases[$version]} )
 	
 	echo
 	for va in "${versionAliases[@]}"; do
diff --git a/update.sh b/update.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
+
+versions=( "$@" )
+if [ ${#versions[@]} -eq 0 ]; then
+	versions=( */ )
+fi
+versions=( "${versions[@]%/}" )
+
+for version in "${versions[@]}"; do
+	fullVersion="$(curl -sSL 'http://golang.org/dl' | grep '">go'"$version"'.*\.src.tar.gz<' | sed -r 's!.*go([^"/<]+)\.src\.tar\.gz.*!\1!' | sort -V | tail -1)"
+	(
+		set -x
+		sed -ri 's/^(ENV GOLANG_VERSION) .*/\1 '"$fullVersion"'/' "$version/Dockerfile"
+		sed -ri 's/^(FROM golang):.*/\1:'"$fullVersion"'/' "$version/"*"/Dockerfile"
+	)
+done

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.3`
	`1`	`+FROM golang:1.3.1`
`2`	`2`
`3`	`3`	`# see http://golang.org/doc/install/source#environment`
`4`	`4`	`# see also http://build.golang.org/`