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:27 UTC
[13/14] incubator-trafficcontrol git commit: clean build for
components
clean build for components
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/1be9566f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/1be9566f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/1be9566f
Branch: refs/heads/master
Commit: 1be9566fd55d2d691ade62f047260deec0b8105d
Parents: 84e2f9d
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Mar 7 09:42:43 2017 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Mar 10 08:18:25 2017 -0700
----------------------------------------------------------------------
infrastructure/docker/build/Dockerfile-traffic_monitor | 9 +++++----
.../docker/build/Dockerfile-traffic_monitor_golang | 10 ++++++----
infrastructure/docker/build/Dockerfile-traffic_ops | 9 +++++----
infrastructure/docker/build/Dockerfile-traffic_portal | 10 ++++++----
infrastructure/docker/build/Dockerfile-traffic_router | 9 +++++----
infrastructure/docker/build/Dockerfile-traffic_stats | 10 ++++++----
6 files changed, 33 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1be9566f/infrastructure/docker/build/Dockerfile-traffic_monitor
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor b/infrastructure/docker/build/Dockerfile-traffic_monitor
index 63dc984..0341f21 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor
@@ -48,9 +48,10 @@ RUN alternatives --install /usr/bin/java java /opt/java/bin/java 2 && \
alternatives --set javac /opt/java/bin/javac && \
alternatives --install /usr/bin/mvn mvn /opt/maven/bin/mvn 1
-WORKDIR /trafficcontrol
-CMD mkdir -p dist && \
- ./build/build.sh traffic_monitor 2>&1 | \
- tee ./dist/build-traffic_monitor.log
+CMD set -x; cp -a /trafficcontrol /tmp/. && \
+ cd /tmp/trafficcontrol && rm -rf dist && mkdir -p dist && \
+ ./build/build.sh traffic_monitor 2>&1 | tee ./dist/build-traffic_monitor.log && \
+ mkdir -p /trafficcontrol/dist && \
+ cp dist/*traffic_monitor* /trafficcontrol/dist
# vi:syntax=Dockerfile
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1be9566f/infrastructure/docker/build/Dockerfile-traffic_monitor_golang
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor_golang b/infrastructure/docker/build/Dockerfile-traffic_monitor_golang
index dc7c80d..52d2dd0 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor_golang
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor_golang
@@ -35,9 +35,11 @@ RUN yum -y install \
yum -y clean all
###
-WORKDIR /trafficcontrol
-CMD mkdir -p dist && \
- ./build/build.sh traffic_monitor_golang 2>&1 | \
- tee ./dist/build-traffic_monitor_golang.log
+CMD set -x; cp -a /trafficcontrol /tmp/. && \
+ cd /tmp/trafficcontrol && rm -rf dist && mkdir -p dist && \
+ ./build/build.sh traffic_monitor_golang 2>&1 | tee ./dist/build-traffic_monitor_golang.log && \
+ mkdir -p /trafficcontrol/dist && \
+ cp dist/*traffic_monitor_golang* /trafficcontrol/dist
+
# vi:syntax=Dockerfile
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1be9566f/infrastructure/docker/build/Dockerfile-traffic_ops
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops b/infrastructure/docker/build/Dockerfile-traffic_ops
index 2d7a748..82dc1a7 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -41,9 +41,10 @@ RUN yum -y install \
tar && \
yum -y clean all
-WORKDIR /trafficcontrol
-CMD mkdir -p dist && \
- ./build/build.sh traffic_ops 2>&1 | \
- tee ./dist/build-traffic_ops.log
+CMD set -x; cp -a /trafficcontrol /tmp/. && \
+ cd /tmp/trafficcontrol && rm -rf dist && mkdir -p dist && \
+ ./build/build.sh traffic_ops 2>&1 | tee ./dist/build-traffic_ops.log && \
+ mkdir -p /trafficcontrol/dist && \
+ cp dist/*traffic_ops* /trafficcontrol/dist
# vi:syntax=Dockerfile
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1be9566f/infrastructure/docker/build/Dockerfile-traffic_portal
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_portal b/infrastructure/docker/build/Dockerfile-traffic_portal
index 96c69dc..7c2a78e 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -47,9 +47,11 @@ RUN echo '{ "allow_root": true }' > /root/.bowerrc
###
-WORKDIR /trafficcontrol
-CMD mkdir -p dist && \
- ./build/build.sh traffic_portal 2>&1 | \
- tee ./dist/build-traffic_portal.log
+CMD set -x; cp -a /trafficcontrol /tmp/. && \
+ cd /tmp/trafficcontrol && rm -rf dist && mkdir -p dist && \
+ ./build/build.sh traffic_portal 2>&1 | tee ./dist/build-traffic_portal.log && \
+ mkdir -p /trafficcontrol/dist && \
+ cp dist/*traffic_portal* /trafficcontrol/dist
+
# vi:syntax=Dockerfile
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1be9566f/infrastructure/docker/build/Dockerfile-traffic_router
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_router b/infrastructure/docker/build/Dockerfile-traffic_router
index c6c17df..842e6c6 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_router
+++ b/infrastructure/docker/build/Dockerfile-traffic_router
@@ -47,9 +47,10 @@ RUN alternatives --install /usr/bin/java java /opt/java/bin/java 2 && \
alternatives --install /usr/bin/mvn mvn /opt/maven/bin/mvn 1
###
-WORKDIR /trafficcontrol
-CMD mkdir -p dist && \
- ./build/build.sh traffic_router 2>&1 | \
- tee ./dist/build-traffic_router.log
+CMD set -x; cp -a /trafficcontrol /tmp/. && \
+ cd /tmp/trafficcontrol && rm -rf dist && mkdir -p dist && \
+ ./build/build.sh traffic_router 2>&1 | tee ./dist/build-traffic_router.log && \
+ mkdir -p /trafficcontrol/dist && \
+ cp dist/*traffic_router* /trafficcontrol/dist
# vi:syntax=Dockerfile
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1be9566f/infrastructure/docker/build/Dockerfile-traffic_stats
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_stats b/infrastructure/docker/build/Dockerfile-traffic_stats
index 8346782..84bfa49 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_stats
+++ b/infrastructure/docker/build/Dockerfile-traffic_stats
@@ -35,9 +35,11 @@ RUN yum -y install \
yum -y clean all
###
-WORKDIR /trafficcontrol
-CMD mkdir -p dist && \
- ./build/build.sh traffic_stats 2>&1 | \
- tee ./dist/build-traffic_stats.log
+CMD set -x; cp -a /trafficcontrol /tmp/. && \
+ cd /tmp/trafficcontrol && rm -rf dist && mkdir -p dist && \
+ ./build/build.sh traffic_stats 2>&1 | tee ./dist/build-traffic_stats.log && \
+ mkdir -p /trafficcontrol/dist && \
+ cp dist/*traffic_stats* /trafficcontrol/dist
+
# vi:syntax=Dockerfile