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:15 UTC
[01/14] incubator-trafficcontrol git commit: fix artifact dir;
add `source` target to build instructions
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master da8a8e225 -> cb08fc3eb
fix artifact dir; add `source` target to build instructions
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/ba2de3ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/ba2de3ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/ba2de3ea
Branch: refs/heads/master
Commit: ba2de3ea706cf6c9f1cc67f496220a6b4c86a816
Parents: 772e72c
Author: Dan Kirkwood <da...@gmail.com>
Authored: Thu Mar 9 11:38:03 2017 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Mar 10 08:18:25 2017 -0700
----------------------------------------------------------------------
BUILD.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ba2de3ea/BUILD.md
----------------------------------------------------------------------
diff --git a/BUILD.md b/BUILD.md
index 53dcdd9..9ad24f9 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -25,6 +25,7 @@ Create and run new build containers:
> $ docker-compose -f infrastructure/docker/build/docker-compose.yml up [ container name ...]
Container names can be one or more of these:
+* `source` (builds only the source tarball)
* `traffic_monitor_build`
* `traffic_ops_build`
* `traffic_portal_build`
@@ -33,4 +34,4 @@ Container names can be one or more of these:
If no component names are provided on the command line, all components will be built.
-All rpms are copied to the following directory: `infrastructure/docker/build/artifacts`.
+All rpms are copied to `dist` at the top level of the `incubator-trafficcontrol` directory.
[05/14] incubator-trafficcontrol git commit: convert Dockerfile for
TM build
Posted by so...@apache.org.
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
[12/14] incubator-trafficcontrol git commit: update BUILD.md
Posted by so...@apache.org.
update BUILD.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/bfcfb625
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/bfcfb625
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/bfcfb625
Branch: refs/heads/master
Commit: bfcfb625cabcebcc4d8975b711db5ea94772638a
Parents: 6dce731
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Mar 1 10:57:12 2017 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Mar 10 08:18:25 2017 -0700
----------------------------------------------------------------------
BUILD.md | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/bfcfb625/BUILD.md
----------------------------------------------------------------------
diff --git a/BUILD.md b/BUILD.md
index aabefe9..53dcdd9 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -11,19 +11,18 @@ are automatically loaded into the image used to build each component.
### Steps
-From the top level of the incubator-trafficcontrol directory. Use the BRANCH
-environment variable to specify the version of Traffic Control to build. One
-or more components (with \_build suffix added) can be added on the command
-line.
+From the top level of the incubator-trafficcontrol directory. The source in
+the current directory is used for the process. One or more components (with
+\_build suffix added) can be added on the command line.
Clean up any previously-built docker containers:
> $ docker-compose -f infrastructure/docker/build/docker-compose.yml down -v
And images:
-> $ docker images | awk '/traffic\_.\*\_build/ { print $3 }' | xargs docker rmi -f
+> $ docker images | awk '/traffic\_.*\_build/ { print $3 }' | xargs docker rmi -f
Create and run new build containers:
-> $ BRANCH=1.8.x docker-compose -f infrastructure/docker/build/docker-compose.yml up [ container name ...]
+> $ docker-compose -f infrastructure/docker/build/docker-compose.yml up [ container name ...]
Container names can be one or more of these:
* `traffic_monitor_build`
[06/14] incubator-trafficcontrol git commit: convert Dockerfile for
TR build
Posted by so...@apache.org.
convert Dockerfile for TR 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/544516e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/544516e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/544516e0
Branch: refs/heads/master
Commit: 544516e0f1eccbc93fd9a2a384034bdbf966b10f
Parents: ad01ebb
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Jan 25 20:34:58 2017 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Mar 10 08:18:25 2017 -0700
----------------------------------------------------------------------
.../docker/build/Dockerfile-traffic_router | 21 ++++++++++----------
1 file changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/544516e0/infrastructure/docker/build/Dockerfile-traffic_router
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_router b/infrastructure/docker/build/Dockerfile-traffic_router
index e2188f9..c6c17df 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_router
+++ b/infrastructure/docker/build/Dockerfile-traffic_router
@@ -18,18 +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
-
-WORKDIR /repo
-
-### traffic_router specific
+### traffic_router specific requirements
RUN yum -y install \
which
@@ -47,10 +47,9 @@ RUN alternatives --install /usr/bin/java java /opt/java/bin/java 2 && \
alternatives --install /usr/bin/mvn mvn /opt/maven/bin/mvn 1
###
-VOLUME ./artifacts:/artifacts
-
-ADD run-build.sh .
-
-CMD ./run-build.sh traffic_router 2>&1 | tee /artifacts/build-traffic_router.log
+WORKDIR /trafficcontrol
+CMD mkdir -p dist && \
+ ./build/build.sh traffic_router 2>&1 | \
+ tee ./dist/build-traffic_router.log
# vi:syntax=Dockerfile
[07/14] incubator-trafficcontrol git commit: convert Dockerfile for
TP build
Posted by so...@apache.org.
convert Dockerfile for TP 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/ba193b8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/ba193b8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/ba193b8f
Branch: refs/heads/master
Commit: ba193b8f2c28846d31d66454868ddfd17862df0f
Parents: 544516e
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Jan 25 20:35:09 2017 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Mar 10 08:18:25 2017 -0700
----------------------------------------------------------------------
.../docker/build/Dockerfile-traffic_portal | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ba193b8f/infrastructure/docker/build/Dockerfile-traffic_portal
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_portal b/infrastructure/docker/build/Dockerfile-traffic_portal
index 7d535f5..96c69dc 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_portal
+++ b/infrastructure/docker/build/Dockerfile-traffic_portal
@@ -18,17 +18,17 @@ 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_portal specific
RUN yum -y install \
gcc \
@@ -47,10 +47,9 @@ RUN echo '{ "allow_root": true }' > /root/.bowerrc
###
-VOLUME ./artifacts:/artifacts
-
-ADD run-build.sh .
-
-CMD ./run-build.sh traffic_portal 2>&1 | tee /artifacts/build-traffic_portal.log
+WORKDIR /trafficcontrol
+CMD mkdir -p dist && \
+ ./build/build.sh traffic_portal 2>&1 | \
+ tee ./dist/build-traffic_portal.log
# vi:syntax=Dockerfile
[10/14] incubator-trafficcontrol git commit: docker-compose build:
disable traffic_monitor_golang_build until it replaces original one
Posted by so...@apache.org.
docker-compose build: disable traffic_monitor_golang_build until it replaces original one
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/84e2f9db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/84e2f9db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/84e2f9db
Branch: refs/heads/master
Commit: 84e2f9dbb0947d7311f274a215a2c49b98bbd803
Parents: 6b139b2
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Mar 3 12:53:28 2017 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Mar 10 08:18:25 2017 -0700
----------------------------------------------------------------------
infrastructure/docker/build/docker-compose.yml | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/84e2f9db/infrastructure/docker/build/docker-compose.yml
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/docker-compose.yml b/infrastructure/docker/build/docker-compose.yml
index bfe0f98..a59d532 100644
--- a/infrastructure/docker/build/docker-compose.yml
+++ b/infrastructure/docker/build/docker-compose.yml
@@ -26,13 +26,16 @@ services:
volumes:
- ../../..:/trafficcontrol
- traffic_monitor_golang_build:
- image: traffic_monitor_golang_builder
- build:
- dockerfile: infrastructure/docker/build/Dockerfile-traffic_monitor_golang
- context: ../../..
- volumes:
- - ../../..:/trafficcontrol
+ # NOTE: Disabled since rpm name collides with current traffic_monitor. To
+ # build golang version, uncomment this section and use `docker-compose ...
+ # up traffic_monitor_golang_build`
+ # traffic_monitor_golang_build:
+ # image: traffic_monitor_golang_builder
+ # build:
+ # dockerfile: infrastructure/docker/build/Dockerfile-traffic_monitor_golang
+ # context: ../../..
+ # volumes:
+ # - ../../..:/trafficcontrol
traffic_ops_build:
image: traffic_ops_builder
[03/14] incubator-trafficcontrol git commit: docker-compose file --
back to v 2 (v 3 not needed)
Posted by so...@apache.org.
docker-compose file -- back to v 2 (v 3 not needed)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/6b139b20
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/6b139b20
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/6b139b20
Branch: refs/heads/master
Commit: 6b139b20a4dd27f14b1c6c47ed5761881fc24d59
Parents: bfcfb62
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Mar 1 12:37:14 2017 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Mar 10 08:18:25 2017 -0700
----------------------------------------------------------------------
infrastructure/docker/build/docker-compose.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6b139b20/infrastructure/docker/build/docker-compose.yml
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/docker-compose.yml b/infrastructure/docker/build/docker-compose.yml
index 16e4acd..bfe0f98 100644
--- a/infrastructure/docker/build/docker-compose.yml
+++ b/infrastructure/docker/build/docker-compose.yml
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
---
-version: '3'
+version: '2'
services:
traffic_monitor_build:
[04/14] incubator-trafficcontrol git commit: dockerfile for
traffic_ops build from local dir
Posted by so...@apache.org.
dockerfile for traffic_ops build from local dir
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/994b7965
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/994b7965
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/994b7965
Branch: refs/heads/master
Commit: 994b7965e1d622360fe1e2a75ff8b528422ab02e
Parents: da8a8e2
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Jan 25 17:36:07 2017 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Mar 10 08:18:25 2017 -0700
----------------------------------------------------------------------
.../docker/build/Dockerfile-traffic_ops | 34 +++++++++-----------
1 file changed, 16 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/994b7965/infrastructure/docker/build/Dockerfile-traffic_ops
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_ops b/infrastructure/docker/build/Dockerfile-traffic_ops
index 0aabc27..2d7a748 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_ops
+++ b/infrastructure/docker/build/Dockerfile-traffic_ops
@@ -18,34 +18,32 @@ 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
+
+### traffic_ops specific requirements
+RUN yum -y install \
expat-devel \
gcc \
- git \
+ golang \
libcurl-devel \
make \
openssl-devel \
perl-ExtUtils-MakeMaker \
- rpm-build \
tar && \
yum -y clean all
-# all ENV vars can be controlled by, e.g. `docker run -e BRANCH=1.6.x <image>`
-ENV GITREPO=https://github.com/apache/incubator-trafficcontrol
-ENV BRANCH=master
-
-WORKDIR /repo
-
-# traffic_ops specific
-RUN yum -y install \
- golang
-###
-
-VOLUME ./artifacts:/artifacts
-
-ADD run-build.sh .
-
-CMD ./run-build.sh traffic_ops 2>&1 | tee /artifacts/build-traffic_ops.log
+WORKDIR /trafficcontrol
+CMD mkdir -p dist && \
+ ./build/build.sh traffic_ops 2>&1 | \
+ tee ./dist/build-traffic_ops.log
# vi:syntax=Dockerfile
[08/14] incubator-trafficcontrol git commit: convert Dockerfile for
TS build
Posted by so...@apache.org.
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
[13/14] incubator-trafficcontrol git commit: clean build for
components
Posted by so...@apache.org.
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
[11/14] incubator-trafficcontrol git commit: builds tarball when all
rpms being built
Posted by so...@apache.org.
builds tarball when all rpms being built
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/4cf95296
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/4cf95296
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/4cf95296
Branch: refs/heads/master
Commit: 4cf95296ede4a92959307b51b846ab888aa6da83
Parents: 1be9566
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Mar 7 15:48:36 2017 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Mar 10 08:18:25 2017 -0700
----------------------------------------------------------------------
build/build.sh | 22 ++++++++------
build/functions.sh | 2 +-
infrastructure/docker/build/Dockerfile-source | 33 +++++++++++++++++++++
infrastructure/docker/build/docker-compose.yml | 8 +++++
4 files changed, 55 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4cf95296/build/build.sh
----------------------------------------------------------------------
diff --git a/build/build.sh b/build/build.sh
index 558fb9e..472d1d8 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -27,30 +27,34 @@ export TC_DIR=$(dirname $(dirname "$topscript"))
checkEnvironment
-# Create tarball first
-if isInGitTree; then
- echo "----- Building tarball ..."
- tarball=$(createTarball "$TC_DIR")
- ls -l $tarball
-else
- echo "---- Skipping tarball creation"
-fi
if [[ $# -gt 0 ]]; then
projects=( "$*" )
else
# get all subdirs containing build/build_rpm.sh
projects_to_build=( */build/build_rpm.sh )
- projects=()
+ # Always build tarball when building everything..
+ projects=(tarball)
for p in "${projects_to_build[@]}"; do
p=${p%%/*}
projects+=($p)
done
fi
+
declare -a badproj
declare -a goodproj
for p in "${projects[@]}"; do
+ if [[ $p == tarball ]]; then
+ if isInGitTree; then
+ echo "----- Building tarball ..."
+ tarball=$(createTarball "$TC_DIR")
+ ls -l $tarball
+ else
+ echo "---- Skipping tarball creation"
+ fi
+ continue
+ fi
# strip trailing /
p=${p%/}
bldscript="$p/build/build_rpm.sh"
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4cf95296/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 8cbdbd5..54fc04c 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -103,7 +103,7 @@ function checkEnvironment {
# verify required tools available in path -- extra tools required by subsystem are passed in
for pgm in git rpmbuild "$@"; do
- type $pgm 2>/dev/null || { echo "$pgm not found in PATH"; exit 1; }
+ type $pgm 2>/dev/null || { echo "$pgm not found in PATH"; }
done
# verify git version
requiredGitVersion=1.7.12
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4cf95296/infrastructure/docker/build/Dockerfile-source
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-source b/infrastructure/docker/build/Dockerfile-source
new file mode 100644
index 0000000..5eb2c89
--- /dev/null
+++ b/infrastructure/docker/build/Dockerfile-source
@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+FROM centos:7
+
+MAINTAINER Dan Kirkwood
+
+###
+# top level of trafficcontrol directory must be mounted as a volume:
+# docker run --volume /trafficcontrol:$(pwd) ...
+VOLUME /trafficcontrol
+
+RUN yum -y install \
+ git && \
+ yum -y clean all
+
+WORKDIR /trafficcontrol
+CMD ./build/build.sh tarball
+
+# vi:syntax=Dockerfile
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/4cf95296/infrastructure/docker/build/docker-compose.yml
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/docker-compose.yml b/infrastructure/docker/build/docker-compose.yml
index a59d532..518ed86 100644
--- a/infrastructure/docker/build/docker-compose.yml
+++ b/infrastructure/docker/build/docker-compose.yml
@@ -18,6 +18,14 @@
version: '2'
services:
+ source:
+ image: trafficcontrol_tarball
+ build:
+ dockerfile: infrastructure/docker/build/Dockerfile-source
+ context: ../../..
+ volumes:
+ - ../../..:/trafficcontrol
+
traffic_monitor_build:
image: traffic_monitor_builder
build:
[09/14] incubator-trafficcontrol git commit: run-build.sh not used
any more..; no repo env vars needed
Posted by so...@apache.org.
run-build.sh not used any more..; no repo env vars needed
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/6dce7318
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/6dce7318
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/6dce7318
Branch: refs/heads/master
Commit: 6dce7318c28395f555712d2aae5515af96a3e199
Parents: 6b3afe2
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Jan 25 20:36:18 2017 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Mar 10 08:18:25 2017 -0700
----------------------------------------------------------------------
.../build/Dockerfile-traffic_monitor_golang | 22 +++---
.../docker/build/Dockerfile-traffic_stats | 4 +-
infrastructure/docker/build/docker-compose.yml | 71 ++++++--------------
infrastructure/docker/build/run-build.sh | 37 ----------
4 files changed, 32 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6dce7318/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 209d4b7..dc7c80d 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_monitor_golang
+++ b/infrastructure/docker/build/Dockerfile-traffic_monitor_golang
@@ -18,26 +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
-
-# Go specific
+### traffic_monitor_golang specific requirements
RUN yum -y install \
golang && \
yum -y clean all
###
-VOLUME ./artifacts:/artifacts
-
-ADD run-build.sh .
-
-CMD ./run-build.sh traffic_monitor_golang 2>&1 | tee /artifacts/build-traffic_monitor_golang.log
+WORKDIR /trafficcontrol
+CMD mkdir -p dist && \
+ ./build/build.sh traffic_monitor_golang 2>&1 | \
+ tee ./dist/build-traffic_monitor_golang.log
# vi:syntax=Dockerfile
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6dce7318/infrastructure/docker/build/Dockerfile-traffic_stats
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/Dockerfile-traffic_stats b/infrastructure/docker/build/Dockerfile-traffic_stats
index 0046bef..8346782 100644
--- a/infrastructure/docker/build/Dockerfile-traffic_stats
+++ b/infrastructure/docker/build/Dockerfile-traffic_stats
@@ -37,7 +37,7 @@ RUN yum -y install \
WORKDIR /trafficcontrol
CMD mkdir -p dist && \
- ./build/build.sh traffic_ops 2>&1 | \
- tee ./dist/build-traffic_ops.log
+ ./build/build.sh traffic_stats 2>&1 | \
+ tee ./dist/build-traffic_stats.log
# vi:syntax=Dockerfile
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6dce7318/infrastructure/docker/build/docker-compose.yml
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/docker-compose.yml b/infrastructure/docker/build/docker-compose.yml
index caa490a..16e4acd 100644
--- a/infrastructure/docker/build/docker-compose.yml
+++ b/infrastructure/docker/build/docker-compose.yml
@@ -15,86 +15,53 @@
# specific language governing permissions and limitations
# under the License.
---
-
-# Build configuration for trafficcontrol
-# Usage:
-# GITREPO=... BRANCH=... docker-compose up [<service>...]
-#
-# 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).
-#
-# [<service>...] (optional) is one or more of the services listed below, e.g.
-# traffic_ops_build. Default is to build all.
-#
-# All rpms are delivered to ./artifacts.
-#
-version: '2'
+version: '3'
services:
traffic_monitor_build:
image: traffic_monitor_builder
build:
- dockerfile: Dockerfile-traffic_monitor
- context: .
- environment:
- - GITREPO
- - BRANCH
+ dockerfile: infrastructure/docker/build/Dockerfile-traffic_monitor
+ context: ../../..
volumes:
- - ./artifacts:/artifacts
+ - ../../..:/trafficcontrol
traffic_monitor_golang_build:
image: traffic_monitor_golang_builder
build:
- dockerfile: Dockerfile-traffic_monitor_golang
- context: .
- environment:
- - GITREPO
- - BRANCH
+ dockerfile: infrastructure/docker/build/Dockerfile-traffic_monitor_golang
+ context: ../../..
volumes:
- - ./artifacts:/artifacts
+ - ../../..:/trafficcontrol
traffic_ops_build:
image: traffic_ops_builder
build:
- dockerfile: Dockerfile-traffic_ops
- context: .
- environment:
- - GITREPO
- - BRANCH
+ dockerfile: infrastructure/docker/build/Dockerfile-traffic_ops
+ context: ../../..
volumes:
- - ./artifacts:/artifacts
+ - ../../..:/trafficcontrol
traffic_portal_build:
image: traffic_portal_builder
build:
- dockerfile: Dockerfile-traffic_portal
- context: .
- environment:
- - GITREPO
- - BRANCH
+ dockerfile: infrastructure/docker/build/Dockerfile-traffic_portal
+ context: ../../..
volumes:
- - ./artifacts:/artifacts
+ - ../../..:/trafficcontrol
traffic_router_build:
image: traffic_router_builder
build:
- dockerfile: Dockerfile-traffic_router
- context: .
- environment:
- - GITREPO
- - BRANCH
+ dockerfile: infrastructure/docker/build/Dockerfile-traffic_router
+ context: ../../..
volumes:
- - ./artifacts:/artifacts
+ - ../../..:/trafficcontrol
traffic_stats_build:
image: traffic_stats_builder
build:
- dockerfile: Dockerfile-traffic_stats
- context: .
- environment:
- - GITREPO
- - BRANCH
+ dockerfile: infrastructure/docker/build/Dockerfile-traffic_stats
+ context: ../../..
volumes:
- - ./artifacts:/artifacts
+ - ../../..:/trafficcontrol
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6dce7318/infrastructure/docker/build/run-build.sh
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/run-build.sh b/infrastructure/docker/build/run-build.sh
deleted file mode 100755
index 58127d8..0000000
--- a/infrastructure/docker/build/run-build.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-target=$1
-[[ -z $target ]] && echo "No target specified"
-echo "Building $target"
-
-echo "GITREPO=${GITREPO:=https://github.com/apache/incubator-trafficcontrol}"
-echo "BRANCH=${BRANCH:=master}"
-
-dir=$(basename $GITREPO)
-set -x
-git clone "$GITREPO" -b "$BRANCH" $dir || echo "Clone failed: $!"
-
-cd $dir/$target
-./build/build_rpm.sh
-mkdir -p /artifacts
-cp ../dist/* /artifacts/.
-
-# Clean up for next build
-cd -
-rm -r $dir
[14/14] incubator-trafficcontrol git commit: This closes #327
Posted by so...@apache.org.
This closes #327
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/cb08fc3e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/cb08fc3e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/cb08fc3e
Branch: refs/heads/master
Commit: cb08fc3eb172ab16510431799bfd45e48d63ca4e
Parents: ba2de3e
Author: Phil Sorber <so...@apache.org>
Authored: Fri Mar 10 08:19:08 2017 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Mar 10 08:19:08 2017 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[02/14] incubator-trafficcontrol git commit: point to build
instructions in top-level BUILD.md
Posted by so...@apache.org.
point to build instructions in top-level BUILD.md
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/772e72ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/772e72ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/772e72ca
Branch: refs/heads/master
Commit: 772e72ca65348fb4d33bf4f4d16c820c770cae32
Parents: 4cf9529
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Mar 8 15:14:57 2017 -0700
Committer: Phil Sorber <so...@apache.org>
Committed: Fri Mar 10 08:18:25 2017 -0700
----------------------------------------------------------------------
infrastructure/docker/build/README.md | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/772e72ca/infrastructure/docker/build/README.md
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/README.md b/infrastructure/docker/build/README.md
index a600340..37134da 100644
--- a/infrastructure/docker/build/README.md
+++ b/infrastructure/docker/build/README.md
@@ -1,9 +1,4 @@
# Building *trafficcontrol* using *docker-compose*
-- install `docker-engine` and `docker-compose`
-- `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`
+Refer to the build instructions in the top-level `incubating-trafficcontrol/BUILD.md`.