Mercurial > public > ssdt-docker

changeset 104:60bb94387b7d production v1.1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
flow: Merged <release> 'v1.1.0' to <master> ('production').
author smith@nwoca.org
date Tue, 11 Apr 2017 02:18:48 +0100
parents 51fef830c0c0 (current diff) 56796bfabd89 (diff)
children ffc2bc12d491
files
diffstat 2 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/import-usas.sh	Mon Apr 10 18:28:10 2017 +0100
+++ b/scripts/import-usas.sh	Tue Apr 11 02:18:48 2017 +0100
@@ -9,12 +9,14 @@
 export IMP_IRN=${IMP_IRN}
 export IMP_URL=${IMP_URL-ftp://username:password@nwoca.org}
 export IMP_PATH=${IMP_PATH}
+
+[ -f "docker-compose.override.yml" ] && export OVERRIDE=" -f docker-compose.override.yml"
 #
-docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usas.yml rm -f usasimport
+docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usas.yml $OVERRIDE rm -f usasimport 
 # start import and wait for completion
-docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usas.yml up usasimport | tee usasimport.log
+docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usas.yml $OVERRIDE up usasimport | tee usasimport.log
 # remove temporary container
-docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usas.yml rm -f usasimport
+docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usas.yml $OVERRIDE rm -f usasimport
 # start application
 docker-compose up -d usasapp
 
--- a/scripts/import-usps.sh	Mon Apr 10 18:28:10 2017 +0100
+++ b/scripts/import-usps.sh	Tue Apr 11 02:18:48 2017 +0100
@@ -12,10 +12,12 @@
 export IMP_ANON=${IMP_ANON:--a false}
 export IMP_EM=${IMP_EM-}
 
-docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usps.yml rm -f uspsimport
+[ -f "docker-compose.override.yml" ] && export OVERRIDE=" -f docker-compose.override.yml"
+
+docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usps.yml $OVERRIDE rm -f uspsimport
 # start import and wait for completion
-docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usps.yml up uspsimport | tee uspsimport.log
+docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usps.yml $OVERRIDE up uspsimport | tee uspsimport.log
 # remove temporary container
-docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usps.yml rm -f uspsimport
+docker-compose -f docker-compose.yml -f /ssdt/compose/preview/import-usps.yml $OVERRIDE rm -f uspsimport
 # start application
 docker-compose up -d uspsapp