# HG changeset patch # User smith@nwoca.org # Date 1499707480 -3600 # Node ID d20c6ff9a821b5869833c66d02ee1035c85b904f # Parent 2fd1dfc5c69ca84d2367487d92b62df384b2aafc DEP-12: upgrade to compose format 3.3 diff -r 2fd1dfc5c69c -r d20c6ff9a821 pilot/setup.sh --- a/pilot/setup.sh Mon Jul 10 18:16:55 2017 +0100 +++ b/pilot/setup.sh Mon Jul 10 18:24:40 2017 +0100 @@ -5,8 +5,6 @@ # # /data/preview/sampletown $ /ssdt/compose2/preview/setup.sh [usas,usps...] # -# -# # Will create a docker-compose.yml and .env file with default settings. # # @@ -61,7 +59,7 @@ if [ "$create" == "OK" ] then - echo "version: \"3.1\"" > ./docker-compose.yml + echo "version: \"3.3\"" > ./docker-compose.yml echo "services:" >> ./docker-compose.yml [ ! "$usas" == "" ] && cat $base/usas-services.yml >> ./docker-compose.yml @@ -82,7 +80,7 @@ else echo " - Error! docker-compose.yml file has been modified or checksum missing. Can auto-apply update(s). + Error! docker-compose.yml file has been modified or checksum missing. Can not auto-apply update(s). Move customizations to docker-compose.override.yml then delete the docker-compose.yml " fi