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 2017/06/06 21:32:01 UTC
[1/2] incubator-trafficcontrol git commit: changed pathing for
traffic_portal alignment
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master cb276ac65 -> a8c50fbc5
changed pathing for traffic_portal alignment
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/81c06c6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/81c06c6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/81c06c6d
Branch: refs/heads/master
Commit: 81c06c6dfb5a877507d4df7e3affe19cae17b6c1
Parents: cb276ac
Author: Dewayne Richardson <de...@apache.org>
Authored: Tue Jun 6 15:25:36 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Tue Jun 6 15:31:29 2017 -0600
----------------------------------------------------------------------
traffic_ops/experimental/ui/Dockerfile | 2 --
traffic_ops/experimental/ui/docker/Dockerfile | 2 --
traffic_ops/experimental/ui/server.js | 2 +-
3 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/81c06c6d/traffic_ops/experimental/ui/Dockerfile
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/Dockerfile b/traffic_ops/experimental/ui/Dockerfile
index 36ac03c..7c1ebd1 100644
--- a/traffic_ops/experimental/ui/Dockerfile
+++ b/traffic_ops/experimental/ui/Dockerfile
@@ -22,5 +22,3 @@ RUN npm install -g bower grunt-cli
RUN echo '{ "allow_root": true }' > /root/.bowerrc
RUN cd /usr/src/app && /usr/local/bin/bower install
RUN cd /usr/src/app && /usr/local/bin/grunt dist
-
-EXPOSE 8888
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/81c06c6d/traffic_ops/experimental/ui/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/docker/Dockerfile b/traffic_ops/experimental/ui/docker/Dockerfile
index 36ac03c..7c1ebd1 100644
--- a/traffic_ops/experimental/ui/docker/Dockerfile
+++ b/traffic_ops/experimental/ui/docker/Dockerfile
@@ -22,5 +22,3 @@ RUN npm install -g bower grunt-cli
RUN echo '{ "allow_root": true }' > /root/.bowerrc
RUN cd /usr/src/app && /usr/local/bin/bower install
RUN cd /usr/src/app && /usr/local/bin/grunt dist
-
-EXPOSE 8888
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/81c06c6d/traffic_ops/experimental/ui/server.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/server.js b/traffic_ops/experimental/ui/server.js
index ac577fb..5dce61c 100644
--- a/traffic_ops/experimental/ui/server.js
+++ b/traffic_ops/experimental/ui/server.js
@@ -30,7 +30,7 @@ var constants = require('constants'),
var config;
try {
- config = require('/etc/traffic_ops_ui/conf/config');
+ config = require('/etc/traffic_portal/conf/config');
}
catch(e) {
config = require('./conf/config');
[2/2] incubator-trafficcontrol git commit: This closes #648
Posted by mi...@apache.org.
This closes #648
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a8c50fbc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a8c50fbc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a8c50fbc
Branch: refs/heads/master
Commit: a8c50fbc57c0aaae1ec49365fb09e621c1dfbb91
Parents: 81c06c6
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue Jun 6 15:31:52 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Tue Jun 6 15:31:52 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------