File tree 4 files changed +37
-5
lines changed
4 files changed +37
-5
lines changed Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ ENV VERSION=1.6 \
15
15
ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin
16
16
17
17
RUN mkdir $TMPDIR && \
18
- INSTALL_PKGS="gcc zip mercurial" && \
18
+ INSTALL_PKGS="make gcc zip mercurial" && \
19
19
yum install -y $INSTALL_PKGS && \
20
20
rpm -V $INSTALL_PKGS && \
21
21
yum clean all && \
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ ENV VERSION=1.4.2 \
15
15
ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin
16
16
17
17
RUN mkdir $TMPDIR && \
18
- INSTALL_PKGS="gcc zip mercurial golang golang-vet golang-cover golang-pkg-darwin-amd64 golang-pkg-windows-amd64 golang-pkg-linux-386" && \
18
+ INSTALL_PKGS="make gcc zip mercurial golang golang-vet golang-cover golang-pkg-darwin-amd64 golang-pkg-windows-amd64 golang-pkg-linux-386" && \
19
19
yum install -y $INSTALL_PKGS && \
20
20
rpm -V $INSTALL_PKGS && \
21
21
yum clean all && \
@@ -27,4 +27,5 @@ LABEL io.k8s.display-name="OpenShift Origin Release Environment (golang-$VERSION
27
27
io.k8s.description="This is the standard release image for OpenShift Origin and contains the necessary build tools to build the platform."
28
28
29
29
# Expect a tar with the source of OpenShift Origin (and /os-version-defs in the root)
30
+ # This image is for OpenShift versions v1.2.0 and earlier.
30
31
CMD bsdtar mxzf - && hack/build-cross.sh
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ ENV VERSION=1.6.2 \
15
15
ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin
16
16
17
17
RUN mkdir $TMPDIR && \
18
- INSTALL_PKGS="gcc zip mercurial" && \
18
+ INSTALL_PKGS="make gcc zip mercurial" && \
19
19
yum install -y $INSTALL_PKGS && \
20
20
rpm -V $INSTALL_PKGS && \
21
21
yum clean all && \
@@ -27,5 +27,5 @@ WORKDIR /go/src/github.com/openshift/origin
27
27
LABEL io.k8s.display-name="OpenShift Origin Release Environment (golang-$VERSION)" \
28
28
io.k8s.description="This is the standard release image for OpenShift Origin and contains the necessary build tools to build the platform."
29
29
30
- # Expect a tar with the source of OpenShift Origin (and /os-version-defs in the root)
31
- CMD bsdtar mxzf - && hack/build-cross.sh
30
+ # Expect the working directory to be populated with the repo source
31
+ CMD hack/build-cross.sh
Original file line number Diff line number Diff line change
1
+ #
2
+ # This is the image that controls the standard build environment for releasing OpenShift Origin.
3
+ # It is responsible for performing a cross platform build of OpenShift.
4
+ #
5
+ # The standard name for this image is openshift/origin-release
6
+ #
7
+ FROM openshift/origin-base
8
+
9
+ ENV VERSION=1.7beta1 \
10
+ GOARM=5 \
11
+ GOPATH=/go \
12
+ GOROOT=/usr/local/go \
13
+ OS_VERSION_FILE=/go/src/github.com/openshift/origin/os-version-defs \
14
+ TMPDIR=/openshifttmp
15
+ ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin
16
+
17
+ RUN mkdir $TMPDIR && \
18
+ INSTALL_PKGS="make gcc zip mercurial" && \
19
+ yum install -y $INSTALL_PKGS && \
20
+ rpm -V $INSTALL_PKGS && \
21
+ yum clean all && \
22
+ curl https://storage.googleapis.com/golang/go$VERSION.linux-amd64.tar.gz | tar -C /usr/local -xzf - && \
23
+ go get golang.org/x/tools/cmd/cover github.com/tools/godep github.com/golang/lint/golint && \
24
+ touch /os-build-image
25
+
26
+ WORKDIR /go/src/github.com/openshift/origin
27
+ LABEL io.k8s.display-name="OpenShift Origin Release Environment (golang-$VERSION)" \
28
+ io.k8s.description="This is the standard release image for OpenShift Origin and contains the necessary build tools to build the platform."
29
+
30
+ # Expect the working directory to be populated with the repo source
31
+ CMD hack/build-cross.sh
You can’t perform that action at this time.
0 commit comments