You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/11/14 17:07:41 UTC
[38/53] [abbrv] incubator-trafficcontrol git commit: README for
docker build for rpms
README for docker build for rpms
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/0e4d60c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/0e4d60c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/0e4d60c5
Branch: refs/heads/psql-rebase
Commit: 0e4d60c558cd7348c0c6da308259afd22ba2fdd7
Parents: aa622d0
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Oct 5 14:24:18 2016 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Nov 11 14:09:35 2016 -0700
----------------------------------------------------------------------
infrastructure/docker/build/README.md | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/0e4d60c5/infrastructure/docker/build/README.md
----------------------------------------------------------------------
diff --git a/infrastructure/docker/build/README.md b/infrastructure/docker/build/README.md
index a600340..469f7da 100644
--- a/infrastructure/docker/build/README.md
+++ b/infrastructure/docker/build/README.md
@@ -1,9 +1,17 @@
+<<<<<<< HEAD
# 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`
+=======
+# Building *traffic_control* using *docker-compose*
+
+- install `docker-engine` and `docker-compose`
+- `cd traffic_control/infrastructure/docker/build`
+- `export GITREPO=https://github.com/<username>/traffic_control`
+>>>>>>> cc99d24... README for docker build for rpms
- `export BRANCH=mynewbranch`
- `docker-compose up traffic_monitor_build traffic_ops_build ...`
- new rpm files will be in `./artifacts`