# HG changeset patch # User smith@nwoca.org # Date 1491846379 -3600 # Node ID 5387d0997596db9e3ecb96719879ee95189c5134 # Parent 6643a8613410e0495260e329d06b61e1bdc1443f DEP-12: include override file in import commands diff -r 6643a8613410 -r 5387d0997596 scripts/import-usas.sh --- a/scripts/import-usas.sh Mon Apr 10 18:27:34 2017 +0100 +++ b/scripts/import-usas.sh Mon Apr 10 18:46:19 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