Commit 9ed1f845 authored by Brian Long's avatar Brian Long
Browse files

Merge branch 'develop' into stable

parents 1c9b4e98 eaedecb5

beedk-acs-platform-it-tile/tile.xml

+1 −9
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ 
									<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>

									<alias>acs-platform-ha</alias>

									<run>

										<skip>false</skip>

										<skip>${beedk.deploy.acs-ha.skip}</skip>

										<env>

											<JAVA_MEMORY_MAX>${acs-platform.memory}</JAVA_MEMORY_MAX>

											<ENABLE_JDWP>false</ENABLE_JDWP>
@@ -228,18 +228,10 @@ 
								<image>

									<name>postgres:${acs-postgres.version}</name>

									<alias>acs-db</alias>

									<links>

										<link>acs-platform</link>

										<link>acs-platform-ha</link>

									</links>

								</image>

								<image>

									<name>apache/activemq-classic:${acs-activemq.version}</name>

									<alias>acs-mq</alias>

									<links>

										<link>acs-platform</link>

										<link>acs-platform-ha</link>

									</links>

								</image>

								<image>

									<name>docker.inteligr8.com/inteligr8/tomcat-rad:${tomcat-rad.version}</name>