#191 archetype and migration update for fabric8 usage in ci and it pr…

…ofiles
boozallen · Jul 11, 2024 · d340666 · d340666
1 parent 721c742
commit d340666
Show file tree

Hide file tree

Showing 10 changed files with 465 additions and 198 deletions.
diff --git a/DRAFT_RELEASE_NOTES.md b/DRAFT_RELEASE_NOTES.md
@@ -34,6 +34,7 @@ Note: instructions for adapting to these changes are outlined in the upgrade ins
 
 # Known Issues
 - There is currently a bug with the Sagemaker training Docker image generated by the `aissemble-sagemaker-training-docker` `Fermenter` profile. The installation of the `logistic-training` module's `requirements.txt` fails, due to an unresolvable set of dependencies.
+- Running a downstream project build with `-Pintegration-test` is currently broken due to incompatibilities that have remained from before the open-sourcing.
 
 # Known Vulnerabilities
 | Date<br/>identified | Vulnerability | Severity | Package | Affected <br/>versions | CVE | Fixed <br/>in |

diff --git a/...dation-archetype/src/main/resources/archetype-resources/__rootArtifactId__-docker/pom.xml b/...dation-archetype/src/main/resources/archetype-resources/__rootArtifactId__-docker/pom.xml
@@ -63,19 +63,14 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-build</id>
-                        <configuration>
-                            <skip>true</skip>
-                            <images>
-                                <image>
-                                    <name>${project.artifactId}:${project.version}</name>
-                                </image>
-                            </images>
-                        </configuration>
-                    </execution>
-                </executions>
+                <configuration>
+                    <skip>true</skip>
+                    <images>
+                        <image>
+                            <name>${project.artifactId}:${project.version}</name>
+                        </image>
+                    </images>
+                </configuration>
             </plugin>
         </plugins>
     </build>
@@ -86,15 +81,16 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.technologybrewery.orphedomos</groupId>
-                        <artifactId>orphedomos-maven-plugin</artifactId>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
                             <skip>false</skip>
-                            <imageVersion>${project.version}</imageVersion>
-                            <!-- Add in repoId that corresponds to the serverId in your settings.xml
-                                 that contains the docker login credentials -->
-                            <repoId />
-                            <repoUrl>${docker.project.repository.url}</repoUrl>
+                            <images>
+                                <image>
+                                    <name>${docker.project.repository.url}/${project.artifactId}:${project.version}
+                                    </name>
+                                </image>
+                            </images>
                         </configuration>
                     </plugin>
                 </plugins>

diff --git a/...rces/archetype-resources/__rootArtifactId__-tests/__rootArtifactId__-tests-docker/pom.xml b/...rces/archetype-resources/__rootArtifactId__-tests/__rootArtifactId__-tests-docker/pom.xml
@@ -14,7 +14,7 @@
     <name>${projectName}::Tests::Docker</name>
     <description>Integration test docker image for ${projectName}</description>
 
-    <packaging>orphedomos</packaging>
+    <packaging>docker-build</packaging>
 
     <build>
         <plugins>
@@ -28,11 +28,15 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.technologybrewery.orphedomos</groupId>
-                <artifactId>orphedomos-maven-plugin</artifactId>
-                <version>${version.orphedomos.plugin}</version>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
                 <configuration>
                     <skip>true</skip>
+                    <images>
+                        <image>
+                            <name>${project.artifactId}:${project.version}</name>
+                        </image>
+                    </images>
                 </configuration>
             </plugin>
         </plugins>
@@ -52,12 +56,15 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.technologybrewery.orphedomos</groupId>
-                        <artifactId>orphedomos-maven-plugin</artifactId>
-                        <version>${version.orphedomos.plugin}</version>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
                         <configuration>
                             <skip>false</skip>
-                            <imageVersion>latest</imageVersion>
+                            <images>
+                                <image>
+                                    <name>${project.artifactId}:latest</name>
+                                </image>
+                            </images>
                         </configuration>
                     </plugin>
                     <plugin>
@@ -73,7 +80,9 @@
                                     <outputDirectory>${project.build.directory}/specifications/</outputDirectory>
                                     <resources>
                                         <resource>
-                                            <directory>${project.parent.basedir}/${project.parent.artifactId}-java/src/main/resources/specifications/</directory>
+                                            <directory>
+                                                ${project.parent.basedir}/${project.parent.artifactId}-java/src/main/resources/specifications/
+                                            </directory>
                                             <includes>
                                                 <include>**</include>
                                             </includes>