FDP-2849: Docker image creation changed to remove version from web-path

Signed-off-by: Sander Verbruggen <[email protected]>
OSGP · Feb 28, 2025 · d85676d · d85676d
1 parent a92a8f4
commit d85676d
Show file tree

Hide file tree

Showing 34 changed files with 34 additions and 17 deletions.
diff --git a/osgp/platform/osgp-adapter-domain-admin/Dockerfile b/osgp/platform/osgp-adapter-domain-admin/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-domain-admin/pom.xml b/osgp/platform/osgp-adapter-domain-admin/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/platform/osgp-adapter-domain-core/Dockerfile b/osgp/platform/osgp-adapter-domain-core/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-domain-core/pom.xml b/osgp/platform/osgp-adapter-domain-core/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/platform/osgp-adapter-domain-publiclighting/Dockerfile b/osgp/platform/osgp-adapter-domain-publiclighting/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-domain-publiclighting/pom.xml b/osgp/platform/osgp-adapter-domain-publiclighting/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/platform/osgp-adapter-domain-smartmetering/Dockerfile b/osgp/platform/osgp-adapter-domain-smartmetering/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-domain-smartmetering/pom.xml b/osgp/platform/osgp-adapter-domain-smartmetering/pom.xml
@@ -33,6 +33,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/platform/osgp-adapter-domain-tariffswitching/Dockerfile b/osgp/platform/osgp-adapter-domain-tariffswitching/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-domain-tariffswitching/pom.xml b/osgp/platform/osgp-adapter-domain-tariffswitching/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/platform/osgp-adapter-ws-admin/Dockerfile b/osgp/platform/osgp-adapter-ws-admin/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-ws-admin/pom.xml b/osgp/platform/osgp-adapter-ws-admin/pom.xml
@@ -37,6 +37,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/platform/osgp-adapter-ws-core/Dockerfile b/osgp/platform/osgp-adapter-ws-core/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-ws-core/pom.xml b/osgp/platform/osgp-adapter-ws-core/pom.xml
@@ -34,6 +34,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/platform/osgp-adapter-ws-publiclighting/Dockerfile b/osgp/platform/osgp-adapter-ws-publiclighting/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-ws-publiclighting/pom.xml b/osgp/platform/osgp-adapter-ws-publiclighting/pom.xml
@@ -33,6 +33,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/platform/osgp-adapter-ws-smartmetering/Dockerfile b/osgp/platform/osgp-adapter-ws-smartmetering/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-ws-smartmetering/pom.xml b/osgp/platform/osgp-adapter-ws-smartmetering/pom.xml
@@ -33,6 +33,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/platform/osgp-adapter-ws-tariffswitching/Dockerfile b/osgp/platform/osgp-adapter-ws-tariffswitching/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-adapter-ws-tariffswitching/pom.xml b/osgp/platform/osgp-adapter-ws-tariffswitching/pom.xml
@@ -33,6 +33,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/platform/osgp-core/Dockerfile b/osgp/platform/osgp-core/Dockerfile
@@ -12,4 +12,4 @@ RUN mkdir -p /var/log/osp && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
 COPY context.xml /usr/local/tomcat/conf
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-core/pom.xml b/osgp/platform/osgp-core/pom.xml
@@ -33,6 +33,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/platform/osgp-logging/Dockerfile b/osgp/platform/osgp-logging/Dockerfile
@@ -12,4 +12,4 @@ RUN mkdir -p /var/log/osp && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
 COPY context.xml /usr/local/tomcat/conf
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/platform/osgp-logging/pom.xml b/osgp/platform/osgp-logging/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/Dockerfile b/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/Dockerfile
@@ -12,4 +12,4 @@ RUN mkdir -p /var/log/osp && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
 COPY context.xml /usr/local/tomcat/conf
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/pom.xml b/osgp/protocol-adapter-iec60870/osgp-protocol-adapter-iec60870/pom.xml
@@ -225,6 +225,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/protocol-adapter-iec61850/osgp-protocol-adapter-iec61850/Dockerfile b/osgp/protocol-adapter-iec61850/osgp-protocol-adapter-iec61850/Dockerfile
@@ -12,4 +12,4 @@ RUN mkdir -p /var/log/osp && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
 COPY context.xml /usr/local/tomcat/conf
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/protocol-adapter-iec61850/osgp-protocol-adapter-iec61850/pom.xml b/osgp/protocol-adapter-iec61850/osgp-protocol-adapter-iec61850/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/protocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/Dockerfile b/osgp/protocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/Dockerfile
@@ -12,4 +12,4 @@ RUN mkdir -p /var/log/osp && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
 COPY context.xml /usr/local/tomcat/conf
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/protocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/pom.xml b/osgp/protocol-adapter-oslp/osgp-protocol-adapter-oslp-elster/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/protocol-adapter-oslp/signing-server/Dockerfile b/osgp/protocol-adapter-oslp/signing-server/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/protocol-adapter-oslp/signing-server/pom.xml b/osgp/protocol-adapter-oslp/signing-server/pom.xml
@@ -32,6 +32,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <attachClasses>true</attachClasses>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>

diff --git a/osgp/protocol-adapter-oslp/web-device-simulator/Dockerfile b/osgp/protocol-adapter-oslp/web-device-simulator/Dockerfile
@@ -11,4 +11,4 @@ RUN mkdir -p /var/log/osp && \
     mkdir -p /usr/local/tomcat/webapps/probe/ && \
     touch /usr/local/tomcat/webapps/probe/probe.txt
 
-COPY target/*.war /usr/local/tomcat/webapps/
+COPY target/gxf /usr/local/tomcat/webapps/
diff --git a/osgp/protocol-adapter-oslp/web-device-simulator/pom.xml b/osgp/protocol-adapter-oslp/web-device-simulator/pom.xml
@@ -252,6 +252,7 @@ SPDX-License-Identifier: Apache-2.0
         <artifactId>maven-war-plugin</artifactId>
         <version>${maven.war.plugin.version}</version>
         <configuration>
+          <webappDirectory>${project.build.directory}/gxf/${project.artifactId}</webappDirectory>
           <failOnMissingWebXml>false</failOnMissingWebXml>
           <nonFilteredFileExtensions>
             <nonFilteredFileExtension>gif</nonFilteredFileExtension>