Skip to content

Commit 6c70f9f

Browse files
author
OpenShift Bot
authored
Merge pull request #9335 from smarterclayton/fix_images
Merged by openshift-bot
2 parents 55a2636 + 1a108ae commit 6c70f9f

File tree

4 files changed

+37
-5
lines changed

4 files changed

+37
-5
lines changed

images/release/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ENV VERSION=1.6 \
1515
ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin
1616

1717
RUN mkdir $TMPDIR && \
18-
INSTALL_PKGS="gcc zip mercurial" && \
18+
INSTALL_PKGS="make gcc zip mercurial" && \
1919
yum install -y $INSTALL_PKGS && \
2020
rpm -V $INSTALL_PKGS && \
2121
yum clean all && \

images/release/golang-1.4/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ENV VERSION=1.4.2 \
1515
ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin
1616

1717
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" && \
1919
yum install -y $INSTALL_PKGS && \
2020
rpm -V $INSTALL_PKGS && \
2121
yum clean all && \
@@ -27,4 +27,5 @@ LABEL io.k8s.display-name="OpenShift Origin Release Environment (golang-$VERSION
2727
io.k8s.description="This is the standard release image for OpenShift Origin and contains the necessary build tools to build the platform."
2828

2929
# 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.
3031
CMD bsdtar mxzf - && hack/build-cross.sh

images/release/golang-1.6/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ENV VERSION=1.6.2 \
1515
ENV PATH=$PATH:$GOROOT/bin:$GOPATH/bin
1616

1717
RUN mkdir $TMPDIR && \
18-
INSTALL_PKGS="gcc zip mercurial" && \
18+
INSTALL_PKGS="make gcc zip mercurial" && \
1919
yum install -y $INSTALL_PKGS && \
2020
rpm -V $INSTALL_PKGS && \
2121
yum clean all && \
@@ -27,5 +27,5 @@ WORKDIR /go/src/github.com/openshift/origin
2727
LABEL io.k8s.display-name="OpenShift Origin Release Environment (golang-$VERSION)" \
2828
io.k8s.description="This is the standard release image for OpenShift Origin and contains the necessary build tools to build the platform."
2929

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

images/release/golang-1.7/Dockerfile

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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

0 commit comments

Comments
 (0)