Add imagebuilder do origin-release Dockerfiles

Author: jhadvig

hack/build-images.sh

@@ -65,7 +65,7 @@ function image-build() {
 	local dir=$2
 	local dest="${tag}"
 	if [[ ! "${tag}" == *":"* ]]; then
-		dest="${tag}:latest"
+		dest="${tag}:${OS_RELEASE_COMMIT}"
 	fi
 
 	local STARTTIME
@@ -78,10 +78,6 @@ function image-build() {
 		os::build::image "${dir}" "${dest}"
 	fi
 
-	# tag to release commit unless we specified a hardcoded tag
-	if [[ ! "${tag}" == *":"* ]]; then
-		docker tag "${dest}" "${tag}:${OS_RELEASE_COMMIT}"
-	fi
 	# ensure the temporary contents are cleaned up
 	git clean -fdx "${dir}"
 

images/release/golang-1.4/Dockerfile

@@ -23,6 +23,7 @@ RUN mkdir $TMPDIR && \
     curl -L https://github.com/google/protobuf/releases/download/v3.0.0-beta-4/protoc-3.0.0-beta-4-linux-x86_64.zip | bsdtar -C /usr/local -xf - && \
     chmod uga+x /usr/local/bin/protoc && \
     curl https://storage.googleapis.com/golang/go$VERSION.linux-amd64.tar.gz | tar -C /usr/local -xzf - && \
+    go get github.com/openshift/imagebuilder/cmd/imagebuilder && \
     touch /os-build-image && \
     git config --global user.name origin-release-container && \
     git config --global user.email [email protected]

images/release/golang-1.6/Dockerfile

@@ -24,6 +24,7 @@ RUN mkdir $TMPDIR && \
     chmod uga+x /usr/local/bin/protoc && \
     curl https://storage.googleapis.com/golang/go$VERSION.linux-amd64.tar.gz | tar -C /usr/local -xzf - && \
     go get golang.org/x/tools/cmd/cover golang.org/x/tools/cmd/goimports github.com/tools/godep github.com/golang/lint/golint && \
+    go get github.com/openshift/imagebuilder/cmd/imagebuilder && \
     touch /os-build-image && \
     git config --global user.name origin-release-container && \
     git config --global user.email [email protected]

images/release/golang-1.7/Dockerfile

@@ -24,6 +24,7 @@ RUN mkdir $TMPDIR && \
     chmod uga+x /usr/local/bin/protoc && \
     curl https://storage.googleapis.com/golang/go$VERSION.linux-amd64.tar.gz | tar -C /usr/local -xzf - && \
     go get golang.org/x/tools/cmd/cover golang.org/x/tools/cmd/goimports github.com/tools/godep github.com/golang/lint/golint && \
+    go get github.com/openshift/imagebuilder/cmd/imagebuilder && \
     touch /os-build-image && \
     git config --global user.name origin-release-container && \
     git config --global user.email [email protected]

images/release/golang-1.8/Dockerfile

@@ -24,6 +24,7 @@ RUN mkdir $TMPDIR && \
     chmod uga+x /usr/local/bin/protoc && \
     curl https://storage.googleapis.com/golang/go$VERSION.linux-amd64.tar.gz | tar -C /usr/local -xzf - && \
     go get golang.org/x/tools/cmd/cover golang.org/x/tools/cmd/goimports github.com/tools/godep github.com/golang/lint/golint && \
+    go get github.com/openshift/imagebuilder/cmd/imagebuilder && \
     touch /os-build-image && \
     git config --global user.name origin-release-container && \
     git config --global user.email [email protected]