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/06/20 15:01:00 UTC
[1/2] incubator-trafficcontrol git commit: updated to add
docker-compose.dev.yml for local development and updated todb.sh helper
script accordingly
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 133e0e2cd -> 98cf5749f
updated to add docker-compose.dev.yml for local development and updated todb.sh helper script accordingly
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/32483df7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/32483df7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/32483df7
Branch: refs/heads/master
Commit: 32483df72ed493ba03985f8a79f6c7ade7b2f162
Parents: 133e0e2
Author: Dewayne Richardson <de...@apache.org>
Authored: Fri Jun 9 08:38:38 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jun 20 09:00:40 2017 -0600
----------------------------------------------------------------------
traffic_ops_db/.gitignore | 1 +
traffic_ops_db/docker/docker-compose.dev.yml | 42 +++++++++++++++++++++++
traffic_ops_db/docker/docker-compose.yml | 18 ++++------
traffic_ops_db/docker/todb.sh | 6 ++--
4 files changed, 52 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/32483df7/traffic_ops_db/.gitignore
----------------------------------------------------------------------
diff --git a/traffic_ops_db/.gitignore b/traffic_ops_db/.gitignore
new file mode 100644
index 0000000..0b58df5
--- /dev/null
+++ b/traffic_ops_db/.gitignore
@@ -0,0 +1 @@
+docker/pgdata
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/32483df7/traffic_ops_db/docker/docker-compose.dev.yml
----------------------------------------------------------------------
diff --git a/traffic_ops_db/docker/docker-compose.dev.yml b/traffic_ops_db/docker/docker-compose.dev.yml
new file mode 100644
index 0000000..16abd5f
--- /dev/null
+++ b/traffic_ops_db/docker/docker-compose.dev.yml
@@ -0,0 +1,42 @@
+#
+# 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:
+ db:
+ build:
+ context: .
+ dockerfile: Dockerfile
+ environment:
+ - POSTGRES_HOST=localhost
+ - POSTGRES_PORT=5432
+ - POSTGRES_DATABASE=traffic_ops
+ - POSTGRES_USER=postgres
+ - POSTGRES_USER_UID=9999
+ - POSTGRES_USER_GID=9999
+ - PGDATA=./pgdata
+ ports:
+ - 5432:5432
+ volumes:
+ - ./pgdata:/pgdata
+ - ./logs:/var/log/postgresql
+ networks:
+ - default
+
+networks:
+ default:
+ driver: bridge
+
+volumes:
+ pgdata:
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/32483df7/traffic_ops_db/docker/docker-compose.yml
----------------------------------------------------------------------
diff --git a/traffic_ops_db/docker/docker-compose.yml b/traffic_ops_db/docker/docker-compose.yml
index 494c154..76b3d9d 100644
--- a/traffic_ops_db/docker/docker-compose.yml
+++ b/traffic_ops_db/docker/docker-compose.yml
@@ -16,21 +16,15 @@ version: '2'
services:
db:
build:
- context: .
- dockerfile: Dockerfile
- environment:
- - POSTGRES_HOST=localhost
- - POSTGRES_PORT=5432
- - POSTGRES_DATABASE=traffic_ops
- - POSTGRES_USER=postgres
- - POSTGRES_USER_UID=9999
- - POSTGRES_USER_GID=9999
- - PGDATA=${PGDATA}
+ context: ..
+ dockerfile: /opt/traffic_ops_db/docker/Dockerfile
+ env_file:
+ - /opt/traffic_ops_db/docker/docker-compose.env
ports:
- 5432:5432
volumes:
- - ./pgdata:/pgdata
- - ./logs:/var/log/postgresql
+ - /data:/data
+ - /var/log/postgresql:/var/log/postgresql
networks:
- default
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/32483df7/traffic_ops_db/docker/todb.sh
----------------------------------------------------------------------
diff --git a/traffic_ops_db/docker/todb.sh b/traffic_ops_db/docker/todb.sh
old mode 100755
new mode 100644
index 7a6e6e4..9481e38
--- a/traffic_ops_db/docker/todb.sh
+++ b/traffic_ops_db/docker/todb.sh
@@ -28,11 +28,11 @@ if [[ "$ACTION" == "setup" ]];then
echo "Setup complete"
elif [[ "$ACTION" == "run" ]];then
- docker-compose -p $PROJECT_NAME up -d
+ docker-compose -f docker-compose.dev.yml -p $PROJECT_NAME up -d
echo "Started Docker container: $CONTAINER_NAME"
elif [[ "$ACTION" == "stop" ]];then
- docker-compose -p $PROJECT_NAME down -v
+ docker-compose -f docker-compose.dev.yml -p $PROJECT_NAME down -v
echo "Stopping Docker container: $CONTAINER_NAME"
elif [[ "$ACTION" == "clean" ]];then
@@ -42,7 +42,7 @@ elif [[ "$ACTION" == "clean" ]];then
docker rmi $PROJECT_NAME
elif [[ "$ACTION" == "seed" ]];then
- docker-compose -p $PROJECT_NAME down -v
+ docker-compose -f docker-compose.dev.yml -p $PROJECT_NAME down -v
else
echo "Valid actions: 'setup', 'run', 'stop', 'clean'"
exit 0
[2/2] incubator-trafficcontrol git commit: This closes #662.
Posted by da...@apache.org.
This closes #662.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/98cf5749
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/98cf5749
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/98cf5749
Branch: refs/heads/master
Commit: 98cf5749fe187a23480052ed60e0f05bf87ffc11
Parents: 32483df
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Jun 20 09:00:54 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jun 20 09:00:54 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------