From 7cb10c024d452d823743c945adb6af08d9e9175b Mon Sep 17 00:00:00 2001
From: Oliver Bertuch <o.bertuch@fz-juelich.de>
Date: Fri, 26 Mar 2021 03:02:22 +0100
Subject: [PATCH] refactor(container): reunite the docker images to enable
 usage with run & start targets, etc. #5292

---
 pom.xml | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index 891a1279dcc..2a7636afca8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,6 @@
         <flyway.version>5.2.4</flyway.version>
         <jhove.version>1.20.1</jhove.version>
         <jacoco.version>0.8.6</jacoco.version>
-        <dmp.version>0.34.1</dmp.version>
     </properties>
     <pluginRepositories>
         <pluginRepository>
@@ -870,14 +869,17 @@
             <id>ct</id>
             <properties>
                 <skipUnitTests>true</skipUnitTests>
+                <app.build.skip>false</app.build.skip>
+                <solr.build.skip>false</solr.build.skip>
                 <app.image.name>gdcc/dataverse-k8s:${project.version}</app.image.name>
+                <solr.image.name>gdcc/solr-k8s:${project.version}</solr.image.name>
             </properties>
             <build>
                 <plugins>
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
-                        <version>${dmp.version}</version>
+                        <version>0.34.1</version>
                         <configuration>
                             <images>
                                 <!-- Dataverse K8s image -->
@@ -885,6 +887,7 @@
                                     <alias>dataverse</alias>
                                     <name>${app.image.name}</name>
                                     <build>
+                                        <skip>${app.build.skip}</skip>
                                         <dockerFile>${project.basedir}/conf/container/Dockerfile</dockerFile>
                                         <filter>@</filter>
                                         <assembly>
@@ -894,32 +897,12 @@
                                         </assembly>
                                     </build>
                                 </image>
-                            </images>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>solr-ct</id>
-            <properties>
-                <skipUnitTests>true</skipUnitTests>
-                <solr.image.name>gdcc/solr-k8s:${project.version}</solr.image.name>
-            </properties>
-        
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>io.fabric8</groupId>
-                        <artifactId>docker-maven-plugin</artifactId>
-                        <version>${dmp.version}</version>
-                        <configuration>
-                            <images>
                                 <!-- Solr K8s image -->
                                 <image>
                                     <alias>solr</alias>
                                     <name>${solr.image.name}</name>
                                     <build>
+                                        <skip>${solr.build.skip}</skip>
                                         <dockerFile>${project.basedir}/conf/solr/Dockerfile</dockerFile>
                                         <filter>@</filter>
                                         <assembly>