Reorganize the OpenShift builds into three stages

* Base image - based on CentOS 7 and are the core for other images
* Release image - a Git cross-platform compile environment that isolates external dependencies
* Origin and other dependent images
* Add useLocalImages to custom pod deployer

The release build generates a set of tar archives containing the binaries for each platform.
The origin image uses the binary from the release, without the Git environment. The remaining
platform images are based on the origin image and do no builds of their own.

Author: smarterclayton

.gitignore

@@ -7,3 +7,4 @@
 *.swp
 .vimrc
 .vagrant-openshift.json
+.DS_Store

Dockerfile

@@ -1,10 +1,23 @@
-FROM google/golang
-MAINTAINER Jessica Forrester <[email protected]>
+#
+# This is the unofficial OpenShift Origin image for the DockerHub. It has as its
+# entrypoint the OpenShift all-in-one binary.
+#
+# See images/origin for the official release version of this image
+#
+# The standard name for this image is openshift/origin
+#
+FROM openshift/origin-base
+
+RUN yum install -y golang && yum clean all
+
+WORKDIR /go/src/github.com/openshift/origin
+ADD .   /go/src/github.com/openshift/origin
+ENV GOPATH /go
+ENV PATH $PATH:$GOROOT/bin:$GOPATH/bin
 
-WORKDIR /gopath/src/github.com/openshift/origin
-ADD . /gopath/src/github.com/openshift/origin
 RUN go get github.com/openshift/origin && \
-    hack/build-go.sh
+    hack/build-go.sh && \
+    cp _output/local/go/bin/* /usr/bin/
 
 EXPOSE 8080
-ENTRYPOINT ["_output/go/bin/openshift"]
+ENTRYPOINT ["/usr/bin/openshift"]

HACKING.md

@@ -1,6 +1,25 @@
 Hacking on OpenShift
 ====================
 
+## Building a Release
+
+To build an OpenShift release you run the `hack/build-release.sh` script on a system with Docker, which
+will create a build environment image and then execute a cross platform Go build within it. The build
+output will be copied to `_output/releases` as a set of tars containing each version. It will also build
+the `openshift/origin-base` image which is the common parent image for all OpenShift Docker images.
+
+    $ hack/build-release.sh
+
+Once the release has been built the official Docker images can be generated with `hack/build-images.sh`.
+The resulting images can then be pushed to a Docker registry.
+
+    $ hack/build-images.sh
+
+Note: To build the base and release images, run:
+
+    $ hack/build-base-images.sh
+
+
 ## Test Suites
 
 OpenShift uses three levels of testing - unit tests, integration test, and end-to-end tests (much

README.md

@@ -28,12 +28,12 @@ Once setup, you can:
 
 2.  Start an OpenShift all-in-one server (includes everything you need to try OpenShift)
 
-        $ _output/go/bin/openshift start
+        $ _output/local/go/bin/openshift start
 
 3.  In another terminal window, switch to the directory and start an app:
 
         $ cd $GOPATH/src/github.com/openshift/origin
-        $ _output/go/bin/openshift kube create pods -c examples/hello-openshift/hello-pod.json
+        $ _output/local/go/bin/openshift kube create pods -c examples/hello-openshift/hello-pod.json
 
 Once that's done, open a browser on your machine and open [http://localhost:6061](http://localhost:6061); you should see a 'Welcome to OpenShift' message.
 

hack/before-install-assets.sh

@@ -1,10 +1,12 @@
 #!/bin/bash
 
-set -e
+set -o errexit
+set -o nounset
+set -o pipefail
 
 # If we are running inside of Travis then do not run the rest of this
 # script unless we want to TEST_ASSETS
-if [[ "${TRAVIS}" == "true" && "${TEST_ASSETS}" == "false" ]]; then
+if [[ "${TRAVIS-}" == "true" && "${TEST_ASSETS-}" == "false" ]]; then
   exit
 fi
 

hack/build-api-docs-image.sh

@@ -4,10 +4,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-hackdir=$(CDPATH="" cd $(dirname $0); pwd)
+OS_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "${OS_ROOT}/hack/common.sh"
 
-cd $hackdir/../api && docker build -t kubernetes/raml2html .
+cd "${OS_ROOT}/api"
+docker build -t kubernetes/raml2html .
 docker rm openshift3docgen &>/dev/null || :
 docker run --name=openshift3docgen kubernetes/raml2html
-docker cp openshift3docgen:/data/openshift3.html $hackdir/../api/
+docker cp openshift3docgen:/data/openshift3.html ${OS_ROOT}/api/
 docker rm openshift3docgen &>/dev/null || :

hack/build-assets.sh

@@ -1,13 +1,16 @@
 #!/bin/bash
 
-set -e
+set -o errexit
+set -o nounset
+set -o pipefail
 
-hackdir=$(CDPATH="" cd $(dirname $0); pwd)
+OS_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "${OS_ROOT}/hack/common.sh"
 
-pushd ${hackdir}/../assets > /dev/null
+pushd "${OS_ROOT}/assets" > /dev/null
   bundle exec grunt build
 popd > /dev/null
 
-pushd ${hackdir}/../ > /dev/null
+pushd "${OS_ROOT}" > /dev/null
   Godeps/_workspace/bin/go-bindata -prefix "assets/dist" -pkg "assets" -o "pkg/assets/bindata.go" assets/dist/...
 popd > /dev/null

hack/build-base-images.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# This script builds the base and release images for use by the release build and image builds.
+#
+# Set OS_IMAGE_PUSH=true to push images to a registry
+#
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+OS_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "${OS_ROOT}/hack/common.sh"
+
+# Go to the top of the tree.
+cd "${OS_ROOT}"
+
+# Build the images
+docker build --tag openshift/origin-base                   "${OS_ROOT}/images/base"
+docker build --tag openshift/origin-haproxy-router-base    "${OS_ROOT}/images/router/haproxy-base"
+docker build --tag openshift/origin-release                "${OS_ROOT}/images/release"

hack/build-cross.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Build all cross compile targets and the base binaries
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+OS_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "${OS_ROOT}/hack/common.sh"
+
+OS_BUILD_PLATFORMS=("${OS_COMPILE_PLATFORMS[@]}")
+os::build::build_binaries "${OS_COMPILE_TARGETS[@]}"
+
+OS_BUILD_PLATFORMS=("${OS_CROSS_COMPILE_PLATFORMS[@]}")
+os::build::build_binaries "${OS_CROSS_COMPILE_TARGETS[@]}"
+
+OS_RELEASE_ARCHIVES="${OS_OUTPUT}/releases"
+os::build::place_bins

hack/build-go.sh

@@ -6,27 +6,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-hackdir=$(CDPATH="" cd $(dirname $0); pwd)
+OS_ROOT=$(dirname "${BASH_SOURCE}")/..
+source "${OS_ROOT}/hack/common.sh"
 
-# Set the environment variables required by the build.
-. "${hackdir}/config-go.sh"
-
-# Go to the top of the tree.
-cd "${OS_REPO_ROOT}"
-
-if [[ $# == 0 ]]; then
-  # Update $@ with the default list of targets to build.
-  set -- cmd/openshift cmd/openshift-router cmd/openshift-deploy
-fi
-
-binaries=()
-for arg; do
-  binaries+=("${OS_GO_PACKAGE}/${arg}")
-done
-
-build_tags=""
-if [[ ! -z "$OS_BUILD_TAGS" ]]; then
-  build_tags="-tags \"$OS_BUILD_TAGS\""
-fi
-
-go install $build_tags -ldflags "$(os::build::ldflags)" "${binaries[@]}"
+os::build::build_binaries "$@"
+os::build::place_bins