# HG changeset patch
# User smith@nwoca.org
# Date 1453320949 0
# Node ID 297b56dfba19fc86baf4ed2cdb290e3ab200b173
# Parent  cd482d0a46e8ab3ff8e0ea947a9e15b2ab35c12b
add training compose file

diff -r cd482d0a46e8 -r 297b56dfba19 compose/preview/training.yml
--- a/compose/preview/training.yml	Wed Jan 20 19:03:38 2016 +0000
+++ b/compose/preview/training.yml	Wed Jan 20 20:15:49 2016 +0000
@@ -6,11 +6,17 @@
     - DB_USER=usas
     - DB_PASS=usasdefault
 usasapp:
-  extends:
-    file: /ssdt/compose/preview/usas.yml
-    service: usasapp
+  restart: unless-stopped
+  image: docker.ssdt.io/usas-app:preview
+  volumes:
+    - ${PWD}/config:/config
+  environment:
+    - DB_HOST=usas-database
+    - DB_NAME=usasdb
+    - DB_USER=usas
+    - DB_PASS=usasdefault
   links:
-    - usasdb:database
+    - usasdb:usas-database
 uspsdb:
   restart: unless-stopped
   image: docker.ssdt.io/trainingdb-usps
@@ -19,9 +25,15 @@
     - DB_USER=usps
     - DB_PASS=uspsdefault
 uspsapp:
-  extends:
-    file: /ssdt/compose/preview/usps.yml
-    service: uspsapp
+  restart: unless-stopped
+  image: docker.ssdt.io/usps-app:preview
+  volumes:
+    - ${PWD}/config:/config
+  environment:
+    - DB_HOST=usps-database
+    - DB_NAME=uspsdb
+    - DB_USER=usps
+    - DB_PASS=uspsdefault
   links:
-    - uspsdb:database
+    - uspsdb:usps-database
 
diff -r cd482d0a46e8 -r 297b56dfba19 trainingdb-usas/Dockerfile
--- a/trainingdb-usas/Dockerfile	Wed Jan 20 19:03:38 2016 +0000
+++ b/trainingdb-usas/Dockerfile	Wed Jan 20 20:15:49 2016 +0000
@@ -5,7 +5,7 @@
 
 RUN chmod a+r $BACKUP_FILE
 
-env DB_NAME=usasdb \
+ENV DB_NAME=usasdb \
     DB_USER=usas \
     DB_PASS=usasdefault
 
diff -r cd482d0a46e8 -r 297b56dfba19 trainingdb/Dockerfile
--- a/trainingdb/Dockerfile	Wed Jan 20 19:03:38 2016 +0000
+++ b/trainingdb/Dockerfile	Wed Jan 20 20:15:49 2016 +0000
@@ -1,5 +1,3 @@
-#
-# Docker file to create postgres image for ssdt applications
 
 FROM docker.ssdt.io/ssdt-postgres:2
 
@@ -8,6 +6,6 @@
 ENV PGDATA=/var/pgdata/trainingdata \
     BACKUP_FILE=/training.backup.gz
 
-COPY setupDatabase.sh /docker-entrypoint-initdb.d/
+COPY setupDatabase.sh /docker-entrypoint-initdb.d/setupDatabase.sh
 
 RUN chmod 755 /docker-entrypoint-initdb.d/setupDatabase.sh