Diff build (#10)

* add to gitignore * pom fixes for releases * pom fixes
kanton-bern · Jan 22, 2024 · b7de600 · b7de600
1 parent 1a88bca
commit b7de600
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 29 deletions.
diff --git a/.gitignore b/.gitignore
@@ -270,6 +270,7 @@ $RECYCLE.BIN/
 # End of https://www.toptal.com/developers/gitignore/api/angular,windows,linux,macos,intellij,maven,java
 /hello-data-portal-ui/src/build.ts
 /docker-compose/smtp4dev-data/database.db
+/hello-data-deployment/docker-compose/base/shared/Extra_Data_Domain/dags/__pycache__/
 .git-versioned-pom.xml
 /hello-data-deployment/docker-compose/.env
 /hello-data-deployment/etls/

diff --git a/.mvn/maven-git-versioning-extension.xml b/.mvn/maven-git-versioning-extension.xml
@@ -1,31 +1,3 @@
-<!--
-
-    Copyright © 2024, Kanton Bern
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-        * Redistributions of source code must retain the above copyright
-          notice, this list of conditions and the following disclaimer.
-        * Redistributions in binary form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the
-          documentation and/or other materials provided with the distribution.
-        * Neither the name of the <organization> nor the
-          names of its contributors may be used to endorse or promote products
-          derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--->
 <configuration
         xmlns="https://github.com/qoomon/maven-git-versioning-extension"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -49,4 +21,4 @@
   <rev>
     <version>${version}</version>
   </rev>
-</configuration>
+</configuration>
diff --git a/hello-data-portal/hello-data-portal-api/pom.xml b/hello-data-portal/hello-data-portal-api/pom.xml
@@ -273,6 +273,22 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>build-docker-image</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>push-docker-image</id>
+                                <phase>${push-docker-image-phase}</phase>
+                                <goals>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
                         <configuration>
                             <!-- Make sure we always have the latest version of the base image, since we are using a rolling tag -->
                             <imagePullPolicy>Always</imagePullPolicy>

diff --git a/hello-data-subsystems/hello-data-airflow/pom.xml b/hello-data-subsystems/hello-data-airflow/pom.xml
@@ -26,6 +26,7 @@
         <java.version>17</java.version>
         <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
         <git-commit-id-maven-plugin.version>5.0.0</git-commit-id-maven-plugin.version>
+        <push-docker-image-phase>post-integration-test</push-docker-image-phase>
         <build.number>local-build</build.number>
         <docker.namespace>bedag</docker.namespace>
         <docker-maven-plugin.version>0.43.4</docker-maven-plugin.version>
@@ -137,6 +138,22 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>build-docker-image</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>push-docker-image</id>
+                                <phase>${push-docker-image-phase}</phase>
+                                <goals>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
                         <configuration>
                             <!-- Make sure we always have the latest version of the base image, since we are using a rolling tag -->
                             <imagePullPolicy>Always</imagePullPolicy>

diff --git a/hello-data-subsystems/hello-data-cloudbeaver/pom.xml b/hello-data-subsystems/hello-data-cloudbeaver/pom.xml
@@ -138,6 +138,22 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>build-docker-image</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>push-docker-image</id>
+                                <phase>${push-docker-image-phase}</phase>
+                                <goals>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
                         <configuration>
                             <!-- Make sure we always have the latest version of the base image, since we are using a rolling tag -->
                             <imagePullPolicy>Always</imagePullPolicy>

diff --git a/hello-data-subsystems/hello-data-monitoring/hello-data-monitoring-sba/pom.xml b/hello-data-subsystems/hello-data-monitoring/hello-data-monitoring-sba/pom.xml
@@ -24,6 +24,7 @@
         <maven.compiler.target>17</maven.compiler.target>
         <micrometer-registry-prometheus.version>1.11.4</micrometer-registry-prometheus.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <push-docker-image-phase>post-integration-test</push-docker-image-phase>
         <start-class>ch.bedag.dap.hellodata.monitoring.sba.SBAdminApplication</start-class>
         <spring-version>3.2.1</spring-version>
         <spring-cloud-starter-kubernetes-client-all-version>3.1.0</spring-cloud-starter-kubernetes-client-all-version>

diff --git a/hello-data-subsystems/hello-data-superset/pom.xml b/hello-data-subsystems/hello-data-superset/pom.xml
@@ -138,6 +138,22 @@
                     <plugin>
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>build-docker-image</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>push-docker-image</id>
+                                <phase>${push-docker-image-phase}</phase>
+                                <goals>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
                         <configuration>
                             <!-- Make sure we always have the latest version of the base image, since we are using a rolling tag -->
                             <imagePullPolicy>Always</imagePullPolicy>