Update parent POM / ACS 7 test setup

repository/pom.xml

@@ -147,6 +147,11 @@
             <artifactId>support-tools-repo</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-broker</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -167,9 +172,6 @@
                             <image>
                                 <!-- customise repository image (second image in parent POM) -->
                                 <run>
-                                    <env>
-                                        <DOCKER_HOST_NAME>${docker.tests.host.name}</DOCKER_HOST_NAME>
-                                    </env>
                                     <!-- add log directory mount to just the contentstore -->
                                     <!-- (cannot be done in parent POM due to hard requirement on specific project structure -->
                                     <!-- for tests to easily check contentstore files, we also mount alf_data locally, not in a volume -->

repository/src/test/docker/Repository-Dockerfile

@@ -1,12 +1,12 @@
 FROM ${docker.tests.repositoryBaseImage}
 COPY maven ${docker.tests.repositoryWebappPath}
 
+${docker.tests.repositoryImageBuilder.preRun}
+
 # merge additions to alfresco-global.properties
 RUN echo "" >> ${docker.tests.repositoryWebappPath}/../../shared/classes/alfresco-global.properties \
     && echo "#MergeGlobalProperties" >> ${docker.tests.repositoryWebappPath}/../../shared/classes/alfresco-global.properties \
     && sed -i '/#MergeGlobalProperties/r ${docker.tests.repositoryWebappPath}/WEB-INF/classes/alfresco/extension/alfresco-global.addition.properties' ${docker.tests.repositoryWebappPath}/../../shared/classes/alfresco-global.properties \
-    && sed -i 's/<secure>true<\/secure>/<secure>false<\/secure>/' $CATALINA_HOME/conf/web.xml \
-    && mv ${docker.tests.repositoryWebappPath}/WEB-INF/classes/alfresco/extension/entrypoint.sh $CATALINA_HOME/bin/ \
-    && chmod +x $CATALINA_HOME/bin/entrypoint.sh
+    && sed -i 's/<secure>true<\/secure>/<secure>false<\/secure>/' $CATALINA_HOME/conf/web.xml
     
-CMD ["entrypoint.sh", "catalina.sh run -security"]
+${docker.tests.repositoryImageBuilder.postRun}

repository/src/test/docker/alfresco/extension/entrypoint.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-ip=`hostname -I | awk '{print $1}'`
-hostip=`echo "${ip}" | sed -E 's/([0-9]+\.[0-9]+)\.0\.[0-9]+/\1.0.1/'`
-hostname="${DOCKER_HOST_NAME}"
-echo "${hostip}   ${hostname}" >> /etc/hosts
-
-bash -c "$@"

repository/src/test/docker/repository-it.xml

@@ -88,6 +88,7 @@
                 <include>org.orderofthebee.support-tools:*</include>
                 <include>com.cronutils:*</include>
                 <include>net.time4j:*</include>
+                <include>org.apache.activemq:activemq-broker</include>
                 <include>de.acosix.alfresco.utility:de.acosix.alfresco.utility.common:*</include>
                 <include>de.acosix.alfresco.utility:de.acosix.alfresco.utility.core.repo.quartz1:*</include>
                 <include>de.acosix.alfresco.utility:de.acosix.alfresco.utility.core.repo.quartz2:*</include>