From 8c16f9351fd1665fdd6de03f8bc6d2bec5e462eb Mon Sep 17 00:00:00 2001 From: Tom Page Date: Wed, 25 Sep 2019 11:41:54 +0100 Subject: [PATCH] Make all configuration execution specific. This introduces some duplication for the start/stop db executions, but I can't see any way to avoid that. We don't want the other configuration being shared between executions. Ensure the db start/stop execution triggers for repo and not for share. --- pom.xml | 234 ++++++++++++++----------- rm-community/rm-community-repo/pom.xml | 17 ++ 2 files changed, 151 insertions(+), 100 deletions(-) diff --git a/pom.xml b/pom.xml index 730f833eab..987c4f38e2 100644 --- a/pom.xml +++ b/pom.xml @@ -260,16 +260,6 @@ io.fabric8 docker-maven-plugin ${fabric8.docker.version} - - - - ${image.name} - - ${project.basedir}/ - - - - build-image @@ -278,6 +268,16 @@ build + + + + ${image.name} + + ${project.basedir}/ + + + + @@ -296,17 +296,6 @@ io.fabric8 docker-maven-plugin ${fabric8.docker.version} - - - - ${image.name}:${image.tag} - ${image.registry} - - ${project.basedir}/ - - - - build-push-image @@ -315,6 +304,17 @@ build push + + + + ${image.name}:${image.tag} + ${image.registry} + + ${project.basedir}/ + + + + @@ -334,23 +334,6 @@ io.fabric8 docker-maven-plugin ${fabric8.docker.version} - - - - ${image.name}:${image.tag} - ${image.registry} - - ${project.basedir}/ - - - - ${image.name}:${image.tag} - - ${project.basedir}/ - - - - build-push-image @@ -359,6 +342,23 @@ build push + + + + ${image.name}:${image.tag} + ${image.registry} + + ${project.basedir}/ + + + + ${image.name}:${image.tag} + + ${project.basedir}/ + + + + @@ -378,17 +378,6 @@ io.fabric8 docker-maven-plugin ${fabric8.docker.version} - - - - ${image.name}:${project.version} - ${image.registry} - - ${project.basedir}/ - - - - build-push-image @@ -397,6 +386,17 @@ build push + + + + ${image.name}:${project.version} + ${image.registry} + + ${project.basedir}/ + + + + @@ -416,23 +416,6 @@ io.fabric8 docker-maven-plugin ${fabric8.docker.version} - - - - ${image.name}:${project.version} - ${image.registry} - - ${project.basedir}/ - - - - ${image.name}:${project.version} - - ${project.basedir}/ - - - - build-push-image @@ -441,6 +424,23 @@ build push + + + + ${image.name}:${project.version} + ${image.registry} + + ${project.basedir}/ + + + + ${image.name}:${project.version} + + ${project.basedir}/ + + + + @@ -463,40 +463,6 @@ io.fabric8 docker-maven-plugin ${fabric8.docker.version} - - - - test-database - postgres:${postgres.version} - - - ${database.port}:${postgresql.port} - - - ${alfresco.db.password} - ${alfresco.db.username} - ${alfresco.test.db.name} - - - -c max_connections=300 - - - database system is ready to accept connections - - - - - - alfresco/alfresco-activemq:${activemq.version} - - - ${activemq.port1}:${activemq.port1} - ${activemq.port2}:${activemq.port2} - - - - - start @@ -504,6 +470,40 @@ start + + + + test-database + postgres:${postgres.version} + + + ${database.port}:${postgresql.port} + + + ${alfresco.db.password} + ${alfresco.db.username} + ${alfresco.test.db.name} + + + -c max_connections=300 + + + database system is ready to accept connections + + + + + + alfresco/alfresco-activemq:${activemq.version} + + + ${activemq.port1}:${activemq.port1} + ${activemq.port2}:${activemq.port2} + + + + + stop @@ -511,6 +511,40 @@ stop + + + + test-database + postgres:${postgres.version} + + + ${database.port}:${postgresql.port} + + + ${alfresco.db.password} + ${alfresco.db.username} + ${alfresco.test.db.name} + + + -c max_connections=300 + + + database system is ready to accept connections + + + + + + alfresco/alfresco-activemq:${activemq.version} + + + ${activemq.port1}:${activemq.port1} + ${activemq.port2}:${activemq.port2} + + + + + diff --git a/rm-community/rm-community-repo/pom.xml b/rm-community/rm-community-repo/pom.xml index a80c2f14ae..570059ae2b 100644 --- a/rm-community/rm-community-repo/pom.xml +++ b/rm-community/rm-community-repo/pom.xml @@ -666,5 +666,22 @@ + + start-db + + + skip.integrationtests + false + + + + + + io.fabric8 + docker-maven-plugin + + + + \ No newline at end of file