From 47d74dba90f37c2f1fe579633b6b286e8054e7c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Sat, 2 Jul 2016 19:53:43 +0200 Subject: [PATCH] Update OpenShift after the final version of https://github.com/openshift/origin/pull/9181 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Uses a tag created after merging that PR. (git clone -b …) does not work with commit IDs, and we like to use a released version anyway. --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index cd72b75b..1040ee1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,9 +43,7 @@ RUN set -x \ RUN set -x \ && yum install -y which git tar wget hostname util-linux bsdtar socat ethtool device-mapper iptables tree findutils nmap-ncat e2fsprogs xfsprogs lsof docker iproute \ && export GOPATH=$(mktemp -d) \ - # && git clone git://github.com/openshift/origin "$GOPATH/src/github.com/openshift/origin" \ - # && git clone -b image-signatures-rest git://github.com/miminar/origin "$GOPATH/src/github.com/openshift/origin" \ - && git clone -b image-signatures-rest-backup git://github.com/mtrmac/origin "$GOPATH/src/github.com/openshift/origin" \ + && git clone -b v1.3.0-alpha.3 git://github.com/openshift/origin "$GOPATH/src/github.com/openshift/origin" \ && (cd "$GOPATH/src/github.com/openshift/origin" && make clean build && make all WHAT=cmd/dockerregistry) \ && cp -a "$GOPATH/src/github.com/openshift/origin/_output/local/bin/linux"/*/* /usr/local/bin \ && cp "$GOPATH/src/github.com/openshift/origin/images/dockerregistry/config.yml" /atomic-registry-config.yml \