Mercurial > public > ssdt-docker

changeset 168:ee988f16aaa6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
flow: Promoted <hotfix> 'v1.2.1' (29c7c4c4e891) to 'default'.
author smith@nwoca.org
date Wed, 16 Aug 2017 16:13:01 +0100
parents b2f07e3add46 (current diff) 29c7c4c4e891 (diff)
children ca027f03409a
files
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Aug 15 21:59:23 2017 +0100
+++ b/.hgtags	Wed Aug 16 16:13:01 2017 +0100
@@ -1,2 +1,4 @@
 63cb9be89a26ba4a69e6bd39a2ba2ee550435f92 v1.0.0
 60bb94387b7dfc56227da60f4b530c4e30a4a985 v1.1.0
+73c0c04a44eb08462f9f94f4256fdf905f339f85 v1.1.1
+daf91a3bbee56ebe7d293a72c9e8732ac1bce724 v1.2.0
--- a/pilot/setup.sh	Tue Aug 15 21:59:23 2017 +0100
+++ b/pilot/setup.sh	Wed Aug 16 16:13:01 2017 +0100
@@ -91,7 +91,7 @@
     md5calc ./docker-compose.yml > .docker-compose.md5
 
     echo "created docker-compose.yml"
-    
+  
 else
     echo "
     
@@ -99,7 +99,12 @@
            Move customizations to docker-compose.override.yml then delete the docker-compose.yml
 "
 fi
-   
+    
+if [ ! -e "docker-compose.override.yml" ] 
+then 
+   echo 'version: "3.3"' >> docker-compose.override.yml   
+fi
+    
 if [ "$USAS_APPLICATIONID" == "" ]
 then
    read -e -p "Generate USAS and USPS integration config? <Y/n> " answer