Merge pull request #229 from boozallen/fabric8-updates

#221 🚀 improve build performance; #230 🔧 use ghcr.io as snapshot repo
boozallen · Jul 25, 2024 · 3a9bacb · 3a9bacb
2 parents 0cad00c + 83f1571
commit 3a9bacb
Show file tree

Hide file tree

Showing 52 changed files with 303 additions and 585 deletions.
diff --git a/.gitignore b/.gitignore
@@ -64,11 +64,8 @@ docs/antora-aissemble-ui/public/
 # Helm charts
 **/charts/*
 Chart.lock
-extensions/extensions-helm/aissemble-airflow-chart/values.yaml
 extensions/extensions-helm/aissemble-spark-operator-chart/values.yaml
 extensions/extensions-helm/aissemble-jenkins-chart/values.yaml
-extensions/extensions-helm/aissemble-mlflow-chart/values.yaml
-extensions/extensions-helm/aissemble-kafka-chart/values.yaml
 extensions/extensions-helm/aissemble-fastapi-chart/values.yaml
 extensions/extensions-helm/aissemble-quarkus-chart/values.yaml
 

diff --git a/DRAFT_RELEASE_NOTES.md b/DRAFT_RELEASE_NOTES.md
@@ -31,6 +31,12 @@ aiSSEMBLE has changed its Docker management plugin from the [orphedomos-maven-pl
 _<A short bulleted list of changes that will cause downstream projects to be partially or wholly inoperable without changes. Instructions for those changes should live in the How To Upgrade section>_
 Note: instructions for adapting to these changes are outlined in the upgrade instructions below.
 - Transitioning from `orphedomos` to `fabric8` may result in breaking changes, see the **Upgrade Steps for Projects with Customized Orphedomos Configurations** for further details.
+- The following docker modules have been deprecated. You need to continue to use the 1.7.0 versions rather than 
+upgrade them. Please note, these will only be breaking IF you try to use the 1.8.0 versions, which would require manual
+intervention. The helm charts referencing these containers have already been updated to use 1.7.0.
+  - `aissemble-airflow`
+  - `aissemble-kafka`
+  - `aissemble-mlflow`
 
 # 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.

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -14,6 +14,13 @@
 
     <description>Build parent to bring in required build-time dependencies (e.g., Maven configuration)</description>
 
+    <distributionManagement>
+        <snapshotRepository>
+            <id>ghcr.io</id>
+            <url>https://maven.pkg.github.com/boozallen/aissemble</url>
+        </snapshotRepository>
+    </distributionManagement>
+
     <properties>
         <version.aissemble>1.8.0-SNAPSHOT</version.aissemble>
 
@@ -75,7 +82,7 @@
         <version.quarkus.cucumber.java>7.4.1</version.quarkus.cucumber.java>
 
         <!-- io.fabric8:docker-maven-plugin -->
-        <version.fabric8.docker.maven.plugin>0.44.0</version.fabric8.docker.maven.plugin>
+        <version.fabric8.docker.maven.plugin>0.45-tb-0.1.0</version.fabric8.docker.maven.plugin>
         <docker.platforms>linux/amd64,linux/arm64</docker.platforms>
 
         <!-- ***************** -->
@@ -546,27 +553,54 @@
                     </configuration>
                 </plugin>
                 <plugin>
-                    <groupId>io.fabric8</groupId>
+                    <!--
+                        NB: using a temporary fork of the docker-maven-plugin for faster local builds.
+                        This can be removed once https://github.com/fabric8io/docker-maven-plugin/issues/1804
+                        is incorporated into the io.fabric8 plugin directly.
+                      -->
+                    <groupId>org.technologybrewery.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
                     <version>${version.fabric8.docker.maven.plugin}</version>
                     <extensions>true</extensions>
+                    <executions>
+                        <execution>
+                            <id>default-push</id>
+                            <phase>deploy</phase>
+                            <goals>
+                                <goal>push</goal>
+                            </goals>
+                            <configuration>
+                                <images>
+                                    <image>
+                                        <build>
+                                            <buildx>
+                                                <builderName>maven</builderName>
+                                                <cacheTo>type=local,dest=~/.docker/cache .</cacheTo>
+                                                <cacheFrom>type=local,src=~/.docker/cache .</cacheFrom>
+                                            </buildx>
+                                        </build>
+                                    </image>
+                                </images>
+                            </configuration>
+                        </execution>
+                    </executions>
                     <configuration>
                         <images>
                             <image>
-                                <name>${docker.baseline.repo.id}/${dockerImageName}:${dockerImageVersion}</name>
+                                <name>${docker.repo.id}/${dockerImageName}:${dockerImageVersion}</name>
                                 <build>
+                                    <args>
+                                        <DOCKER_BASELINE_REPO_ID>${docker.baseline.repo.id}/</DOCKER_BASELINE_REPO_ID>
+                                        <VERSION_AISSEMBLE>${version.aissemble}</VERSION_AISSEMBLE>
+                                        <SPARK_VERSION>${version.spark}</SPARK_VERSION>
+                                    </args>
                                     <buildx>
-                                        <!-- use default cache, passed to docker via config flag.-->
+                                        <builderName>default</builderName>
                                         <dockerStateDir>~/.docker</dockerStateDir>
                                         <platforms>
                                             <platform>${docker.platforms}</platform>
                                         </platforms>
                                     </buildx>
-                                    <args>
-                                        <DOCKER_BASELINE_REPO_ID>${docker.baseline.repo.id}/</DOCKER_BASELINE_REPO_ID>
-                                        <VERSION_AISSEMBLE>${version.aissemble}</VERSION_AISSEMBLE>
-                                        <SPARK_VERSION>${version.spark}</SPARK_VERSION>
-                                    </args>
                                     <contextDir>${project.basedir}</contextDir>
                                     <dockerFile>./src/main/resources/docker/Dockerfile</dockerFile>
                                 </build>
@@ -992,6 +1026,33 @@ To suppress enforce-helm-version rule, you must add following plugin to the root
                                 <useDevRepository>true</useDevRepository>
                             </configuration>
                         </plugin>
+                        <plugin>
+                            <groupId>org.technologybrewery.fabric8</groupId>
+                            <artifactId>docker-maven-plugin</artifactId>
+                            <version>${version.fabric8.docker.maven.plugin}</version>
+                            <executions>
+                                <execution>
+                                    <id>default-build</id>
+                                    <phase>package</phase>
+                                    <goals>
+                                        <goal>build</goal>
+                                    </goals>
+                                    <configuration>
+                                        <!-- Deploy will build all platforms, so skip build phase in this case: -->
+                                        <buildArchiveOnly>true</buildArchiveOnly>
+                                        <images>
+                                            <image>
+                                                <build>
+                                                    <buildx>
+                                                        <builderName>maven</builderName>
+                                                    </buildx>
+                                                </build>
+                                            </image>
+                                        </images>
+                                    </configuration>
+                                </execution>
+                            </executions>
+                        </plugin>
                     </plugins>
                 </pluginManagement>
             </build>

diff --git a/extensions/extensions-docker/aissemble-airflow/LICENSE.txt b/extensions/extensions-docker/aissemble-airflow/LICENSE.txt
diff --git a/extensions/extensions-docker/aissemble-airflow/pom.xml b/extensions/extensions-docker/aissemble-airflow/pom.xml
diff --git a/extensions/extensions-docker/aissemble-airflow/src/main/resources/docker/Dockerfile b/extensions/extensions-docker/aissemble-airflow/src/main/resources/docker/Dockerfile