# HG changeset patch
# User smith@nwoca.org
# Date 1556721180 -3600
# Node ID 15d0cffd99801a905f5a6e63d1b1a86a5222cbd8
# Parent  a49f7cad889946c22466e617dcb54d5ec7be0c55# Parent  108e4913cd81457d876f3e475810d5513de0d5aa
flow: Merged <release> 'v2.5.0' to <master> ('production').

diff -r a49f7cad8899 -r 15d0cffd9980 bamboo-agent/Dockerfile
--- a/bamboo-agent/Dockerfile	Thu Dec 27 00:06:14 2018 +0000
+++ b/bamboo-agent/Dockerfile	Wed May 01 15:33:00 2019 +0100
@@ -47,6 +47,14 @@
 ENV ANT_HOME /opt/ant
 ENV PATH ${PATH}:/opt/ant/bin
 
+
+RUN cd && \
+    curl -fL -o apache-maven-bin.tar.gz http://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.0.3/apache-maven-3.0.3-bin.tar.gz  && \
+    tar -xzf apache-maven-bin.tar.gz && \
+     mv apache-maven-3.0.3 /usr/share  && \
+    rm apache-maven-bin.tar.gz
+ENV PATH ${PATH}:/usr/share/apache-maven-3.0.3/bin
+
 RUN curl -fL -o docker.tgz "https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz"; 
 RUN	tar --extract \
 		--file docker.tgz \
diff -r a49f7cad8899 -r 15d0cffd9980 prod/training.yml
--- a/prod/training.yml	Thu Dec 27 00:06:14 2018 +0000
+++ b/prod/training.yml	Wed May 01 15:33:00 2019 +0100
@@ -24,6 +24,7 @@
         aliases:
         - ${USAS_APP_HOST:-usasapp-svr}
     environment:
+      - APPLICATION_INSTANCE_TYPE=Training
       - APPLICATION_ADMIN_PASSWORD=training
       - APPLICATION_ADMIN_RESET=true
       - DB_HOST=usasdb
@@ -59,6 +60,7 @@
         aliases:
         - ${USPS_APP_HOST:-uspsapp-svr}
     environment:
+      - APPLICATION_INSTANCE_TYPE=Training
       - APPLICATION_ADMIN_PASSWORD=training
       - APPLICATION_ADMIN_RESET=true
       - DB_HOST=uspsdb
diff -r a49f7cad8899 -r 15d0cffd9980 prod/usas-services.yml
--- a/prod/usas-services.yml	Thu Dec 27 00:06:14 2018 +0000
+++ b/prod/usas-services.yml	Wed May 01 15:33:00 2019 +0100
@@ -25,6 +25,7 @@
       - DB_PASS=${USAS_DB_PASSWORD:-usasdefault}
       - DB_POOL_LEAKDETECTIONTHRESHOLD=300000
       - SSL_POLICY=${SSL_POLICY:-Mozilla-Modern}
+      - APPLICATION_INSTANCE_TYPE=${APPLICATION_INSTANCE_TYPE:-Production}
       - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_CLIENTHOST=${USPS_APP_HOST:-uspsapp-svr}
       - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_CLIENTDNSLOOKUP=true
       - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERHOST=0.0.0.0
diff -r a49f7cad8899 -r 15d0cffd9980 prod/usps-services.yml
--- a/prod/usps-services.yml	Thu Dec 27 00:06:14 2018 +0000
+++ b/prod/usps-services.yml	Wed May 01 15:33:00 2019 +0100
@@ -25,6 +25,7 @@
       - DB_PASS=${USPS_DB_PASSWORD:-uspsdefault}
       - DB_POOL_LEAKDETECTIONTHRESHOLD=300000
       - SSL_POLICY=${SSL_POLICY:-Mozilla-Modern}
+      - APPLICATION_INSTANCE_TYPE=${APPLICATION_INSTANCE_TYPE:-Production}
       - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTHOST=${USAS_APP_HOST:-usasapp-svr}
       - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_CLIENTDNSLOOKUP=true
       - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERHOST=0.0.0.0
diff -r a49f7cad8899 -r 15d0cffd9980 scripts/restore-container.sh
--- a/scripts/restore-container.sh	Thu Dec 27 00:06:14 2018 +0000
+++ b/scripts/restore-container.sh	Wed May 01 15:33:00 2019 +0100
@@ -17,6 +17,7 @@
 
 target=$(basename $1)
 target=${target%%.*}
+target=${target#*-}
 
 project=$(composeGetProject $target)