# HG changeset patch # User smith@nwoca.org # Date 1491851184 -3600 # Node ID 13751fd2e40a52e618cf69825e0d521edbc9e825 # Parent 43c423e8f420cb917c288d8da458f38f812e9af1 DEP-12: include override file in import commands diff -r 43c423e8f420 -r 13751fd2e40a scripts/import-usps.sh --- a/scripts/import-usps.sh Mon Apr 10 18:50:28 2017 +0100 +++ b/scripts/import-usps.sh Mon Apr 10 20:06:24 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