You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by so...@apache.org on 2017/03/10 15:20:22 UTC

[08/14] incubator-trafficcontrol git commit: convert Dockerfile for TS build

convert Dockerfile for TS build


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/6b3afe24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/6b3afe24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/6b3afe24

Branch: refs/heads/master
Commit: 6b3afe24d4bd0d4c51ac6de1ede530503082946c
Parents: ba193b8
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Jan 25 20:35:44 2017 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Mar 10 08:18:25 2017 -0700

----------------------------------------------------------------------
 .../docker/build/Dockerfile-traffic_stats       | 21 ++++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6b3afe24/infrastructure/docker/build/Dockerfile-traffic_stats
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_stats b/infrastructure/docker/build/Dockerfile-traffic_stats
index d669b03..0046bef 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_stats
+++ b/infrastructure/docker/build/Dockerfile-traffic_stats
@@ -18,27 +18,26 @@ FROM centos:7
 
 MAINTAINER Dan Kirkwood
 
+# top level of trafficcontrol directory must be mounted as a volume:
+# docker run --volume /trafficcontrol:$(pwd) ...
+VOLUME /trafficcontrol
+
+### Common for all sub-component builds
 RUN	yum -y install \
 		epel-release \
 		git \
 		rpm-build && \
 	yum -y clean all
 
-ENV GITREPO https://github.com/apache/incubator-trafficcontrol
-ENV BRANCH master
-
-WORKDIR /repo
-
-# traffic_stats specific
+### traffic_stats specific requirements
 RUN	yum -y install \
 		golang && \
 	yum -y clean all
 ###
 
-VOLUME ./artifacts:/artifacts
-
-ADD run-build.sh .
-
-CMD ./run-build.sh traffic_stats 2>&1 | tee /artifacts/build-traffic_stats.log
+WORKDIR /trafficcontrol
+CMD mkdir -p dist && \
+	./build/build.sh traffic_ops 2>&1 | \
+	tee ./dist/build-traffic_ops.log
 
 # vi:syntax=Dockerfile