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 2016/12/05 21:34:58 UTC
[2/3] incubator-trafficcontrol git commit: add convert service for
docker-compose for psql conversion
add convert service for docker-compose for psql conversion
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/140ca3e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/140ca3e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/140ca3e9
Branch: refs/heads/psql-rebase
Commit: 140ca3e9470758a7fe77e0d2851cc38481b44a8e
Parents: 570d605
Author: Dan Kirkwood <da...@gmail.com>
Authored: Thu Dec 1 20:51:06 2016 +0000
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Sun Dec 4 05:42:17 2016 +0000
----------------------------------------------------------------------
.../app/db/pg-migration/Dockerfile-convert | 7 +++++++
.../app/db/pg-migration/Dockerfile-pgloader | 2 +-
.../app/db/pg-migration/docker-compose.yml | 19 +++++++++++++++----
3 files changed, 23 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/140ca3e9/traffic_ops/app/db/pg-migration/Dockerfile-convert
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/Dockerfile-convert b/traffic_ops/app/db/pg-migration/Dockerfile-convert
new file mode 100644
index 0000000..7f96523
--- /dev/null
+++ b/traffic_ops/app/db/pg-migration/Dockerfile-convert
@@ -0,0 +1,7 @@
+FROM postgres:9.6
+
+MAINTAINER Dan Kirkwood
+
+ADD convert_bools.sql .
+
+CMD psql postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$POSTGRES_HOST/$POSTGRES_DB < ./convert_bools.sql
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/140ca3e9/traffic_ops/app/db/pg-migration/Dockerfile-pgloader
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/Dockerfile-pgloader b/traffic_ops/app/db/pg-migration/Dockerfile-pgloader
index 5bd4aab..5acc979 100644
--- a/traffic_ops/app/db/pg-migration/Dockerfile-pgloader
+++ b/traffic_ops/app/db/pg-migration/Dockerfile-pgloader
@@ -4,5 +4,5 @@ MAINTAINER Dan Kirkwood <da...@apache.org>
# install nc to check that postgres and mysql are ready..
RUN apt-get -y install netcat
-ADD runpgloader.sh .
+ADD pg-migration/runpgloader.sh .
CMD ./runpgloader.sh
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/140ca3e9/traffic_ops/app/db/pg-migration/docker-compose.yml
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/docker-compose.yml b/traffic_ops/app/db/pg-migration/docker-compose.yml
index c8ac83d..fc327fa 100644
--- a/traffic_ops/app/db/pg-migration/docker-compose.yml
+++ b/traffic_ops/app/db/pg-migration/docker-compose.yml
@@ -1,10 +1,11 @@
version: '2'
services:
+ # dataimport reads data from an existing traffic_ops server running mysql thru the API
dataimport:
build:
- dockerfile: Dockerfile-traffic_ops-client
context: .
+ dockerfile: Dockerfile-traffic_ops-client
restart: "no"
environment:
- TO_USER
@@ -14,6 +15,7 @@ services:
volumes:
- ./mysql/initdb.d:/docker-entrypoint-initdb.d
+ # mysql_host loads mysql data locally and provides direct access for pgloader
mysql_host:
image: mysql:5.6
restart: "no"
@@ -28,10 +30,11 @@ services:
- ./mysql/conf.d:/etc/mysql/conf.d
- ./mysql/initdb.d:/docker-entrypoint-initdb.d
+ # postgres_host provides a postgres data to import data to
postgres_host:
build:
- dockerfile: pg-migration/Dockerfile-postgres
context: ..
+ dockerfile: pg-migration/Dockerfile-postgres
restart: "no"
environment:
- POSTGRES_DB=traffic_ops
@@ -42,10 +45,11 @@ services:
ports:
- 5432
+ # pgloader converts the data from mysql to postgres
pgloader:
build:
- dockerfile: Dockerfile-pgloader
- context: .
+ context: ..
+ dockerfile: pg-migration/Dockerfile-pgloader
restart: "no"
depends_on:
- mysql_host
@@ -59,3 +63,10 @@ services:
- POSTGRES_DB=traffic_ops
- POSTGRES_PASSWORD=twelve
- POSTGRES_USER=traffic_ops
+
+ # convert runs necessary post-import conversion(s) in postgres
+ convert:
+ build:
+ context: ..
+ dockerfile: pg-migration/Dockerfile-convert
+ restart: "no"