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 2017/01/06 20:23:35 UTC
[1/4] incubator-trafficcontrol git commit: remove cpanm, git,
go from requires in rpm spec file -- need to have user install these
separately
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/1.8.x 2acea69f8 -> 20d7e37b5
remove cpanm, git, go from requires in rpm spec file -- need to have user install these separately
(cherry picked from commit 537d3fd61e1490aa3e0362025f24cc9aa5f76c84)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/f305e150
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/f305e150
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/f305e150
Branch: refs/heads/1.8.x
Commit: f305e1505e70a0945c01784f2a88f90d139d0c17
Parents: 2acea69
Author: Dan Kirkwood <da...@gmail.com>
Authored: Thu Jan 5 12:08:02 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Jan 6 10:10:05 2017 -0700
----------------------------------------------------------------------
traffic_ops/build/traffic_ops.spec | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/f305e150/traffic_ops/build/traffic_ops.spec
----------------------------------------------------------------------
diff --git a/traffic_ops/build/traffic_ops.spec b/traffic_ops/build/traffic_ops.spec
index bbb571e..1922ce6 100644
--- a/traffic_ops/build/traffic_ops.spec
+++ b/traffic_ops/build/traffic_ops.spec
@@ -32,7 +32,7 @@ URL: https://github.com/Comcast/traffic_control/
Vendor: Comcast
Packager: daniel_kirkwood at Cable dot Comcast dot com
AutoReqProv: no
-Requires: expat-devel, mod_ssl, mkisofs, libpcap-devel, mysql, openssl, perl-core, perl-DBI, perl-DBD-MySQL, perl-Digest-SHA1, perl-WWW-Curl, perl-libwww-perl, cpanminus, git, go
+Requires: expat-devel, mod_ssl, mkisofs, libpcap-devel, mysql, openssl, perl-core, perl-DBI, perl-DBD-MySQL, perl-Digest-SHA1, perl-WWW-Curl, perl-libwww-perl
Requires(pre): /usr/sbin/useradd, /usr/bin/getent
Requires(postun): /usr/sbin/userdel
@@ -99,13 +99,6 @@ Built: %(date) by %{getenv: USER}
fi
%post
- # Install Perl modules required for postinstall to run
- cpanm -n Term::ReadPassword JSON
-
- # Install goose for db migrations
- export GOPATH="/opt/traffic_ops/install"
- go get bitbucket.org/liamstask/goose/cmd/goose
-
%__cp %{PACKAGEDIR}/etc/init.d/traffic_ops /etc/init.d/traffic_ops
%__cp %{PACKAGEDIR}/etc/cron.d/trafops_dnssec_refresh /etc/cron.d/trafops_dnssec_refresh
%__cp %{PACKAGEDIR}/etc/logrotate.d/traffic_ops /etc/logrotate.d/traffic_ops
[2/4] incubator-trafficcontrol git commit: change tarball name from
incubator-... to incubation-...
Posted by da...@apache.org.
change tarball name from incubator-... to incubation-...
(cherry picked from commit f965b09742fdabaee5368fd62930ed48cfcf9e87)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/50e88b3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/50e88b3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/50e88b3a
Branch: refs/heads/1.8.x
Commit: 50e88b3a5f5fc6c1c9ea1fa9514c987536a64dc8
Parents: f305e15
Author: Dan Kirkwood <da...@gmail.com>
Authored: Thu Jan 5 16:12:15 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Jan 6 13:22:35 2017 -0700
----------------------------------------------------------------------
build/functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/50e88b3a/build/functions.sh
----------------------------------------------------------------------
diff --git a/build/functions.sh b/build/functions.sh
index 9175906..816d4c1 100755
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -159,7 +159,7 @@ function buildRpm () {
# ---------------------------------------
function createTarball() {
local projDir=$(cd "$1"; pwd)
- local projName=incubator-trafficcontrol
+ local projName=incubation-trafficcontrol
local version=$(getVersion "$TC_DIR")
local tarball="dist/$projName-$version.tar.gz"
[3/4] incubator-trafficcontrol git commit: add docker-compose cleanup
and component names to build instructions
Posted by da...@apache.org.
add docker-compose cleanup and component names to build instructions
(cherry picked from commit 77c8ad078a6e9925a6b780323bcb377611753793)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/20d7e37b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/20d7e37b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/20d7e37b
Branch: refs/heads/1.8.x
Commit: 20d7e37b57b9aa47e7731595641920de268ea219
Parents: ff5a63a
Author: Dan Kirkwood <da...@gmail.com>
Authored: Fri Jan 6 10:58:54 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Jan 6 13:22:35 2017 -0700
----------------------------------------------------------------------
BUILD.md | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/20d7e37b/BUILD.md
----------------------------------------------------------------------
diff --git a/BUILD.md b/BUILD.md
index db2adb2..aabefe9 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -14,10 +14,24 @@ are automatically loaded into the image used to build each component.
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:
+line.
-> $ BRANCH=1.8.x docker-compose -f infrastructure/docker/build/docker-compose.yml up traffic\_monitor\_build
+Clean up any previously-built docker containers:
+> $ docker-compose -f infrastructure/docker/build/docker-compose.yml down -v
-If no component names are provided here, all components will be built.
+And images:
+> $ 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 ...]
+Container names can be one or more of these:
+* `traffic_monitor_build`
+* `traffic_ops_build`
+* `traffic_portal_build`
+* `traffic_router_build`
+* `traffic_stats_build`
+
+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`.
[4/4] incubator-trafficcontrol git commit: add build instruction
Posted by da...@apache.org.
add build instruction
(cherry picked from commit c5b7cd19a0156ed425efa3575b198e90c970e910)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/ff5a63ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/ff5a63ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/ff5a63ab
Branch: refs/heads/1.8.x
Commit: ff5a63aba98d702e18765b007970d74e3a5d49bf
Parents: 50e88b3
Author: Dan Kirkwood <da...@gmail.com>
Authored: Thu Jan 5 14:47:52 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Jan 6 13:22:35 2017 -0700
----------------------------------------------------------------------
BUILD.md | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ff5a63ab/BUILD.md
----------------------------------------------------------------------
diff --git a/BUILD.md b/BUILD.md
new file mode 100644
index 0000000..db2adb2
--- /dev/null
+++ b/BUILD.md
@@ -0,0 +1,23 @@
+# Building Traffic Control Components
+
+## Build using docker-compose
+
+This is the easiest way to build all the components of Traffic Control; all requirements
+are automatically loaded into the image used to build each component.
+
+### Requirements
+- `docker` (https://docs.docker.com/engine/installation/)
+- `docker-compose` (https://docs.docker.com/compose/install/)
+
+### 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:
+
+> $ BRANCH=1.8.x docker-compose -f infrastructure/docker/build/docker-compose.yml up traffic\_monitor\_build
+
+If no component names are provided here, all components will be built.
+
+