Mercurial > public > ssdt-docker

changeset 98:51fef830c0c0 production

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
flow: Promoted <release> 'v1.1.0' (6643a8613410) to 'production'.
author smith@nwoca.org
date Mon, 10 Apr 2017 18:28:10 +0100
parents 120fc16ea511 (current diff) 6643a8613410 (diff)
children 60bb94387b7d
files compose/preview/debug.yml
diffstat 6 files changed, 27 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/compose/preview/debug.yml	Thu Oct 13 00:39:56 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-uspsdebug:
-  image: docker.ssdt.io/ssdt-postgres:3
-  command: /bin/bash
-  links:
-    - uspsdb:database
-  environment:
-    - DB_HOST=database
-    - DB_NAME=$${DATABASE_ENV_DB_NAME}
-    - DB_USER=$${DATABASE_ENV_DB_USER}
-    - DB_PASS=$${DATABASE_ENV_DB_PASS}
-usasdebug:
-  image: docker.ssdt.io/ssdt-postgres:3
-  command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH} ${IMP_ANON} ${IMP_EM}
-  links:
-    - usasdb:database
-  environment:
-    - DB_HOST=database
-    - DB_NAME=$${DATABASE_ENV_DB_NAME}
-    - DB_USER=$${DATABASE_ENV_DB_USER}
-    - DB_PASS=$${DATABASE_ENV_DB_PASS}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compose/preview/import-usas.yml	Mon Apr 10 18:28:10 2017 +0100
@@ -0,0 +1,10 @@
+usasimport:
+  image: docker.ssdt.io/usas-import:preview
+  command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH}
+  links:
+    - usasdb:database
+  environment:
+    - DB_HOST=database
+    - DB_NAME=$${DATABASE_ENV_DB_NAME}
+    - DB_USER=$${DATABASE_ENV_DB_USER}
+    - DB_PASS=$${DATABASE_ENV_DB_PASS}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compose/preview/import-usps.yml	Mon Apr 10 18:28:10 2017 +0100
@@ -0,0 +1,10 @@
+uspsimport:
+  image: docker.ssdt.io/usps-import:preview
+  command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH} ${IMP_ANON} ${IMP_EM}
+  links:
+    - uspsdb:database
+  environment:
+    - DB_HOST=database
+    - DB_NAME=$${DATABASE_ENV_DB_NAME}
+    - DB_USER=$${DATABASE_ENV_DB_USER}
+    - DB_PASS=$${DATABASE_ENV_DB_PASS}
--- a/scripts/import-usas.sh	Thu Oct 13 00:39:56 2016 +0100
+++ b/scripts/import-usas.sh	Mon Apr 10 18:28:10 2017 +0100
@@ -9,14 +9,12 @@
 export IMP_IRN=${IMP_IRN}
 export IMP_URL=${IMP_URL-ftp://username:password@nwoca.org}
 export IMP_PATH=${IMP_PATH}
-export IMP_ANON=${IMP_ANON-}
-export IMP_EM=${IMP_EM-}
 #
-docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import.yml rm -f usasimport
+docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usas.yml rm -f usasimport
 # start import and wait for completion
-docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import.yml up usasimport | tee usasimport.log
+docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usas.yml up usasimport | tee usasimport.log
 # remove temporary container
-docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import.yml rm -f usasimport
+docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usas.yml rm -f usasimport
 # start application
 docker-compose up -d usasapp
 
--- a/scripts/import-usps.sh	Thu Oct 13 00:39:56 2016 +0100
+++ b/scripts/import-usps.sh	Mon Apr 10 18:28:10 2017 +0100
@@ -12,10 +12,10 @@
 export IMP_ANON=${IMP_ANON:--a false}
 export IMP_EM=${IMP_EM-}
 
-docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import.yml rm -f uspsimport
+docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usps.yml rm -f uspsimport
 # start import and wait for completion
-docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import.yml up uspsimport | tee uspsimport.log
+docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usps.yml up uspsimport | tee uspsimport.log
 # remove temporary container
-docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import.yml rm -f uspsimport
+docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usps.yml rm -f uspsimport
 # start application
 docker-compose up -d uspsapp
--- a/update.sh	Thu Oct 13 00:39:56 2016 +0100
+++ b/update.sh	Mon Apr 10 18:28:10 2017 +0100
@@ -1,4 +1,4 @@
 #!/bin/bash
 SSDT_HOME="$( dirname "${BASH_SOURCE[0]}")"
 docker pull docker.ssdt.io/ssdt-utils
-docker run -it -v $SSDT_HOME:/ssdt --rm docker.ssdt.io/ssdt-utils update
+docker run -it -v $SSDT_HOME:/ssdt --rm docker.ssdt.io/ssdt-utils update ${1}