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/01 15:28:04 UTC
[1/3] incubator-trafficcontrol git commit: removed spaces
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 492400897 -> 2c62282e2
removed spaces
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/178ecc69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/178ecc69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/178ecc69
Branch: refs/heads/master
Commit: 178ecc694819ac41ffa1f5746d3ed0b3ed7739e1
Parents: bb6fa8e
Author: Dewayne Richardson <de...@apache.org>
Authored: Wed May 31 13:06:48 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Thu Jun 1 09:27:24 2017 -0600
----------------------------------------------------------------------
traffic_ops/experimental/ui/docker/docker-compose.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/178ecc69/traffic_ops/experimental/ui/docker/docker-compose.yml
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/docker/docker-compose.yml b/traffic_ops/experimental/ui/docker/docker-compose.yml
index a4fb3f8..3629b5d 100644
--- a/traffic_ops/experimental/ui/docker/docker-compose.yml
+++ b/traffic_ops/experimental/ui/docker/docker-compose.yml
@@ -22,7 +22,7 @@ services:
- 80:80
- 443:443
volumes:
- - /etc/traffic_portal/conf:/etc/traffic_portal/conf
+ - /etc/traffic_portal/conf:/etc/traffic_portal/conf
- /etc/pki:/etc/pki
networks:
- default
[2/3] incubator-trafficcontrol git commit: updated to rename the
traffic_ops_ui to traffic_portal
Posted by mi...@apache.org.
updated to rename the traffic_ops_ui to traffic_portal
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/bb6fa8ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/bb6fa8ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/bb6fa8ef
Branch: refs/heads/master
Commit: bb6fa8ef3b7bc72bff3dcce11967dcda5cc222c6
Parents: 4924008
Author: Dewayne Richardson <de...@apache.org>
Authored: Wed May 31 13:05:13 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Thu Jun 1 09:27:24 2017 -0600
----------------------------------------------------------------------
traffic_ops/experimental/ui/docker-compose.yml | 30 --------------------
traffic_ops/experimental/ui/docker/clean.sh | 2 +-
.../experimental/ui/docker/docker-compose.yml | 4 +--
.../etc/systemd/service/trafficops-ui.service | 30 --------------------
.../etc/systemd/system/traffic_portal.service | 30 ++++++++++++++++++++
5 files changed, 33 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/bb6fa8ef/traffic_ops/experimental/ui/docker-compose.yml
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/docker-compose.yml b/traffic_ops/experimental/ui/docker-compose.yml
deleted file mode 100644
index 9e2f246..0000000
--- a/traffic_ops/experimental/ui/docker-compose.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed 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.
-#
-version: '2'
-
-services:
- ui:
- build:
- context: .
- dockerfile: Dockerfile
- ports:
- - 80:8080
- volumes:
- - /etc/traffic_ops_ui/conf:/etc/traffic_ops_ui/conf
- networks:
- - default
-
-networks:
- default:
- driver: bridge
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/bb6fa8ef/traffic_ops/experimental/ui/docker/clean.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/docker/clean.sh b/traffic_ops/experimental/ui/docker/clean.sh
index 9a43659..b63afa2 100755
--- a/traffic_ops/experimental/ui/docker/clean.sh
+++ b/traffic_ops/experimental/ui/docker/clean.sh
@@ -18,5 +18,5 @@
#docker-compose -p trafficops build
-docker rmi trafficops_ui
+docker rmi traffic_portal
docker ps -a
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/bb6fa8ef/traffic_ops/experimental/ui/docker/docker-compose.yml
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/docker/docker-compose.yml b/traffic_ops/experimental/ui/docker/docker-compose.yml
index 71cc1f2..a4fb3f8 100644
--- a/traffic_ops/experimental/ui/docker/docker-compose.yml
+++ b/traffic_ops/experimental/ui/docker/docker-compose.yml
@@ -17,12 +17,12 @@ services:
ui:
build:
context: ..
- dockerfile: /opt/traffic_ops_ui/docker/Dockerfile
+ dockerfile: /opt/traffic_portal/docker/Dockerfile
ports:
- 80:80
- 443:443
volumes:
- - /etc/traffic_ops_ui/conf:/etc/traffic_ops_ui/conf
+ - /etc/traffic_portal/conf:/etc/traffic_portal/conf
- /etc/pki:/etc/pki
networks:
- default
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/bb6fa8ef/traffic_ops/experimental/ui/etc/systemd/service/trafficops-ui.service
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/etc/systemd/service/trafficops-ui.service b/traffic_ops/experimental/ui/etc/systemd/service/trafficops-ui.service
deleted file mode 100644
index 3b2d8c4..0000000
--- a/traffic_ops/experimental/ui/etc/systemd/service/trafficops-ui.service
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed 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.
-#
-#-----------------------------------------
-# Ansible managed
-#-----------------------------------------
-#
-[Unit]
-Description=Traffic Ops UI Docker Container
-Requires=docker.service
-After=docker.service
-
-[Service]
-Restart=always
-ExecStart=/usr/bin/docker-compose -p trafficops -f /opt/traffic_ops_ui/docker/docker-compose.yml up
-ExecStop=/usr/bin/docker-compose -p trafficops -f /opt/traffic_ops_ui/docker/docker-compose.yml down -v
-WorkingDirectory=/opt/traffic_ops_ui
-
-[Install]
-WantedBy=default.target
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/bb6fa8ef/traffic_ops/experimental/ui/etc/systemd/system/traffic_portal.service
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/etc/systemd/system/traffic_portal.service b/traffic_ops/experimental/ui/etc/systemd/system/traffic_portal.service
new file mode 100644
index 0000000..dc24d3a
--- /dev/null
+++ b/traffic_ops/experimental/ui/etc/systemd/system/traffic_portal.service
@@ -0,0 +1,30 @@
+#
+# Licensed 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.
+#
+#-----------------------------------------
+# Ansible managed
+#-----------------------------------------
+#
+[Unit]
+Description=Traffic Portal Docker Container
+Requires=docker.service
+After=docker.service
+
+[Service]
+Restart=always
+ExecStart=/usr/bin/docker-compose -p traffic -f /opt/traffic_portal/docker/docker-compose.yml up
+ExecStop=/usr/bin/docker-compose -p traffic -f /opt/traffic_portal/docker/docker-compose.yml down -v
+WorkingDirectory=/opt/traffic_portal/docker
+
+[Install]
+WantedBy=default.target
[3/3] incubator-trafficcontrol git commit: This closes #632
Posted by mi...@apache.org.
This closes #632
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/2c62282e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/2c62282e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/2c62282e
Branch: refs/heads/master
Commit: 2c62282e2736942cdad5e0502e88a73f10940113
Parents: 178ecc6
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Thu Jun 1 09:27:52 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Thu Jun 1 09:27:52 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------