Merge pull request #9335 from smarterclayton/fix_images

Merged by openshift-bot

Author: OpenShift Bot

images/release/Dockerfile

@@ -15,7 +15,7 @@ ENV VERSION=1.6 \
 ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin
 
 RUN mkdir $TMPDIR && \
-    INSTALL_PKGS="gcc zip mercurial" && \
+    INSTALL_PKGS="make gcc zip mercurial" && \
     yum install -y $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     yum clean all && \

images/release/golang-1.4/Dockerfile

@@ -15,7 +15,7 @@ ENV VERSION=1.4.2 \
 ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin
 
 RUN mkdir $TMPDIR && \
-    INSTALL_PKGS="gcc zip mercurial golang golang-vet golang-cover golang-pkg-darwin-amd64 golang-pkg-windows-amd64 golang-pkg-linux-386" && \
+    INSTALL_PKGS="make gcc zip mercurial golang golang-vet golang-cover golang-pkg-darwin-amd64 golang-pkg-windows-amd64 golang-pkg-linux-386" && \
     yum install -y $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     yum clean all && \
@@ -27,4 +27,5 @@ LABEL io.k8s.display-name="OpenShift Origin Release Environment (golang-$VERSION
       io.k8s.description="This is the standard release image for OpenShift Origin and contains the necessary build tools to build the platform."
 
 # Expect a tar with the source of OpenShift Origin (and /os-version-defs in the root)
+# This image is for OpenShift versions v1.2.0 and earlier.
 CMD bsdtar mxzf - && hack/build-cross.sh

images/release/golang-1.6/Dockerfile

@@ -15,7 +15,7 @@ ENV VERSION=1.6.2 \
 ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin
 
 RUN mkdir $TMPDIR && \
-    INSTALL_PKGS="gcc zip mercurial" && \
+    INSTALL_PKGS="make gcc zip mercurial" && \
     yum install -y $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     yum clean all && \
@@ -27,5 +27,5 @@ WORKDIR /go/src/github.com/openshift/origin
 LABEL io.k8s.display-name="OpenShift Origin Release Environment (golang-$VERSION)" \
       io.k8s.description="This is the standard release image for OpenShift Origin and contains the necessary build tools to build the platform."
 
-# Expect a tar with the source of OpenShift Origin (and /os-version-defs in the root)
-CMD bsdtar mxzf - && hack/build-cross.sh
+# Expect the working directory to be populated with the repo source
+CMD hack/build-cross.sh

images/release/golang-1.7/Dockerfile

@@ -0,0 +1,31 @@
+#
+# This is the image that controls the standard build environment for releasing OpenShift Origin.
+# It is responsible for performing a cross platform build of OpenShift.
+#
+# The standard name for this image is openshift/origin-release
+#
+FROM openshift/origin-base
+
+ENV VERSION=1.7beta1 \
+    GOARM=5 \
+    GOPATH=/go \
+    GOROOT=/usr/local/go \
+    OS_VERSION_FILE=/go/src/github.com/openshift/origin/os-version-defs \
+    TMPDIR=/openshifttmp
+ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin
+
+RUN mkdir $TMPDIR && \
+    INSTALL_PKGS="make gcc zip mercurial" && \
+    yum install -y $INSTALL_PKGS && \
+    rpm -V $INSTALL_PKGS && \
+    yum clean all && \
+    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 github.com/tools/godep github.com/golang/lint/golint && \
+    touch /os-build-image
+
+WORKDIR /go/src/github.com/openshift/origin
+LABEL io.k8s.display-name="OpenShift Origin Release Environment (golang-$VERSION)" \
+      io.k8s.description="This is the standard release image for OpenShift Origin and contains the necessary build tools to build the platform."
+
+# Expect the working directory to be populated with the repo source
+CMD hack/build-cross.sh