Mercurial > public > ssdt-docker

diff scripts/import-usas.sh @ 107:dc3696525de4 feature/djs-DEP-12-docker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge from default
author smith@nwoca.org
date Fri, 21 Apr 2017 17:17:24 +0100
parents 43c423e8f420
children fea886ba7279
line wrap: on
line diff
--- a/scripts/import-usas.sh	Fri Apr 21 17:16:35 2017 +0100
+++ b/scripts/import-usas.sh	Fri Apr 21 17:17:24 2017 +0100
@@ -9,14 +9,14 @@
 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-}
+
+[ -f "docker-compose.override.yml" ] && export OVERRIDE=" -f docker-compose.override.yml"
 #
-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 $OVERRIDE 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 $OVERRIDE 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 $OVERRIDE rm -f usasimport
 # start application
 docker-compose up -d usasapp