You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2016/10/20 14:26:12 UTC
[2/3] incubator-trafficcontrol git commit: refer to new apache
product in docker build files
refer to new apache product in docker build files
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/4c3cf214
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/4c3cf214
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/4c3cf214
Branch: refs/heads/master
Commit: 4c3cf21468fc986355d343cc4c41f6ccc7a96c06
Parents: e408053
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Oct 19 14:58:41 2016 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Oct 19 14:58:41 2016 -0600
----------------------------------------------------------------------
infrastructure/docker/build/Dockerfile-traffic_monitor | 2 +-
infrastructure/docker/build/Dockerfile-traffic_ops | 2 +-
infrastructure/docker/build/Dockerfile-traffic_portal | 2 +-
infrastructure/docker/build/Dockerfile-traffic_router | 2 +-
infrastructure/docker/build/Dockerfile-traffic_stats | 2 +-
infrastructure/docker/build/README.md | 6 +++---
infrastructure/docker/build/docker-compose.yml | 6 +++---
infrastructure/docker/build/run-build.sh | 9 +++++----
8 files changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4c3cf214/infrastructure/docker/build/Dockerfile-traffic_monitor
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_monitor b/infrastructure/docker/build/Dockerfile-traffic_monitor
index 1a253b7..ec8aa69 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor
@@ -8,7 +8,7 @@ RUN yum -y install \
rpm-build && \
yum -y clean all
-ENV GITREPO=https://github.com/Comcast/traffic_control
+ENV GITREPO=https://github.com/apache/incubator-trafficcontrol
ENV BRANCH=master
# Above are common for all sub-projects.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4c3cf214/infrastructure/docker/build/Dockerfile-traffic_ops
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops b/infrastructure/docker/build/Dockerfile-traffic_ops
index 87c6458..9ab2b0a 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -26,7 +26,7 @@ RUN yum install -y \
# all ENV vars can be controlled by, e.g. `docker run -e BRANCH=1.6.x <image>`
-ENV GITREPO=https://github.com/Comcast/traffic_control
+ENV GITREPO=https://github.com/apache/incubator-trafficcontrol
ENV BRANCH=master
WORKDIR /repo
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4c3cf214/infrastructure/docker/build/Dockerfile-traffic_portal
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_portal b/infrastructure/docker/build/Dockerfile-traffic_portal
index 5763459..37fa848 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -8,7 +8,7 @@ RUN yum -y install \
rpm-build && \
yum -y clean all
-ENV GITREPO https://github.com/Comcast/traffic_control
+ENV GITREPO https://github.com/apache/incubator-trafficcontrol
ENV BRANCH master
WORKDIR /repo
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4c3cf214/infrastructure/docker/build/Dockerfile-traffic_router
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_router b/infrastructure/docker/build/Dockerfile-traffic_router
index 733c738..8f7c139 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_router
+++ b/infrastructure/docker/build/Dockerfile-traffic_router
@@ -8,7 +8,7 @@ RUN yum -y install \
rpm-build && \
yum -y clean all
-ENV GITREPO https://github.com/Comcast/traffic_control
+ENV GITREPO https://github.com/apache/incubator-trafficcontrol
ENV BRANCH master
WORKDIR /repo
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4c3cf214/infrastructure/docker/build/Dockerfile-traffic_stats
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_stats b/infrastructure/docker/build/Dockerfile-traffic_stats
index dbf66c8..d81914f 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_stats
+++ b/infrastructure/docker/build/Dockerfile-traffic_stats
@@ -8,7 +8,7 @@ RUN yum -y install \
rpm-build && \
yum -y clean all
-ENV GITREPO https://github.com/Comcast/traffic_control
+ENV GITREPO https://github.com/apache/incubator-trafficcontrol
ENV BRANCH master
WORKDIR /repo
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4c3cf214/infrastructure/docker/build/README.md
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/README.md b/infrastructure/docker/build/README.md
index 6e7a7bd..a600340 100644
--- a/infrastructure/docker/build/README.md
+++ b/infrastructure/docker/build/README.md
@@ -1,9 +1,9 @@
-# Building *traffic_control* using *docker-compose*
+# Building *trafficcontrol* using *docker-compose*
- install `docker-engine` and `docker-compose`
-- `cd traffic_control/infrastructure/docker/build`
-- `export GITREPO=https://github.com/<username>/traffic_control`
+- `cd incubator-trafficcontrol/infrastructure/docker/build`
+- `export GITREPO=https://github.com/<username>/incubator-trafficcontrol`
- `export BRANCH=mynewbranch`
- `docker-compose up traffic_monitor_build traffic_ops_build ...`
- new rpm files will be in `./artifacts`
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4c3cf214/infrastructure/docker/build/docker-compose.yml
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/docker-compose.yml b/infrastructure/docker/build/docker-compose.yml
index b219c5f..861a3f3 100644
--- a/infrastructure/docker/build/docker-compose.yml
+++ b/infrastructure/docker/build/docker-compose.yml
@@ -1,11 +1,11 @@
---
-# Build configuration for traffic_control
+# Build configuration for trafficcontrol
# Usage:
# GITREPO=... BRANCH=... docker-compose up [<service>...]
#
-# where GITREPO is https path to traffic_control clone
-# (default: https://github.com/Comcast/traffic_control)
+# where GITREPO is https path to trafficcontrol clone
+# (default: https://github.com/apache/incubator-trafficcontrol)
# and <branch> is name of branch to test
# (default: master).
#
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4c3cf214/infrastructure/docker/build/run-build.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/run-build.sh b/infrastructure/docker/build/run-build.sh
index cbe00a9..fd6b784 100755
--- a/infrastructure/docker/build/run-build.sh
+++ b/infrastructure/docker/build/run-build.sh
@@ -4,17 +4,18 @@ target=$1
[[ -z $target ]] && echo "No target specified"
echo "Building $target"
-echo "GITREPO=${GITREPO:=https://github.com/Comcast/traffic_control}"
+echo "GITREPO=${GITREPO:=https://github.com/apache/incubator-trafficcontrol}"
echo "BRANCH=${BRANCH:=master}"
+dir=$(basename $GITREPO)
set -x
-git clone $GITREPO -b $BRANCH traffic_control
+git clone "$GITREPO" -b "$BRANCH" $dir || echo "Clone failed: $!"
-cd traffic_control/$target
+cd $dir/$target
./build/build_rpm.sh
mkdir -p /artifacts
cp ../dist/* /artifacts/.
# Clean up for next build
cd -
-rm -r traffic_control
+rm -r $dir