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:19 UTC
[05/14] incubator-trafficcontrol git commit: convert Dockerfile for
TM build
convert Dockerfile for TM 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/ad01ebba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/ad01ebba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/ad01ebba
Branch: refs/heads/master
Commit: ad01ebbaa17d196869e1ef07559e21a0d96da817
Parents: 994b796
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Jan 25 18:27:54 2017 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Mar 10 08:18:25 2017 -0700
----------------------------------------------------------------------
.../docker/build/Dockerfile-traffic_monitor | 22 +++++++++-----------
1 file changed, 10 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ad01ebba/infrastructure/docker/build/Dockerfile-traffic_monitor
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor b/infrastructure/docker/build/Dockerfile-traffic_monitor
index a97aaed..63dc984 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor
@@ -18,17 +18,18 @@ 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
-
-# Above are common for all sub-projects.
-
### traffic_monitor specific
RUN yum -y install \
which && \
@@ -46,13 +47,10 @@ RUN alternatives --install /usr/bin/java java /opt/java/bin/java 2 && \
alternatives --set jar /opt/java/bin/jar && \
alternatives --set javac /opt/java/bin/javac && \
alternatives --install /usr/bin/mvn mvn /opt/maven/bin/mvn 1
-WORKDIR /
-###
-
-VOLUME ./artifacts:/artifacts
-
-ADD run-build.sh .
-CMD ./run-build.sh traffic_monitor 2>&1 | tee /artifacts/build-traffic_monitor.log
+WORKDIR /trafficcontrol
+CMD mkdir -p dist && \
+ ./build/build.sh traffic_monitor 2>&1 | \
+ tee ./dist/build-traffic_monitor.log
# vi:syntax=Dockerfile