You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/11/14 17:07:43 UTC
[40/53] [abbrv] incubator-trafficcontrol git commit: use env defaults
if unset for docker build clone
use env defaults if unset for docker build clone
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/f7c243fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/f7c243fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/f7c243fa
Branch: refs/heads/psql-rebase
Commit: f7c243fa157d3a327870b1bf58972a798d3b6ced
Parents: 558ddb2
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Oct 7 17:11:19 2016 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Nov 11 14:14:47 2016 -0700
----------------------------------------------------------------------
infrastructure/docker/build/Dockerfile-clone | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/f7c243fa/infrastructure/docker/build/Dockerfile-clone
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-clone b/infrastructure/docker/build/Dockerfile-clone
index 64a8698..3679ee1 100644
--- a/infrastructure/docker/build/Dockerfile-clone
+++ b/infrastructure/docker/build/Dockerfile-clone
@@ -8,14 +8,16 @@ RUN yum -y install \
rpm-build && \
yum -y clean all
-ENV GITREPO=https://github.com/Comcast/traffic_control
-ENV BRANCH=master
+ENV GITREPO https://github.com/Comcast/traffic_control
+ENV BRANCH master
WORKDIR /repo
-RUN echo $'pwd; git clone $GITREPO -b $BRANCH traffic_control\n\
-touch clone-finished\n\
-' >/run.sh
+RUN echo $'\n\
+echo GITREPO=${GITREPO:=https://github.com/Comcast/traffic_control}\n\
+echo BRANCH=${BRANCH:=master}\n\
+git clone $GITREPO -b $BRANCH traffic_control && touch clone-finished\n\
+' >run.sh
-CMD sh -x /run.sh
+CMD sh -x /repo/run.sh
# vi:syntax=Dockerfile