Skip to content

Commit

Permalink
Merge pull request #326 from boozallen/320-fix-fabric8-migration
Browse files Browse the repository at this point in the history 
[#320] fix docker plugin config to account for change from orphedomos
  • Loading branch information
@ewilkins-csi
ewilkins-csi authored Sep 11, 2024
2 parents 7343409 + 4d7df2e commit 24d66e9
Show file tree
Hide file tree
Showing 43 changed files with 1,798 additions and 193 deletions.
54 changes: 28 additions & 26 deletions ...dation-archetype/src/main/resources/archetype-resources/__rootArtifactId__-docker/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,18 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>${group.fabric8.plugin}</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<images>
<image>
<name>${project.artifactId}:${project.version}</name>
</image>
</images>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand All @@ -60,39 +72,29 @@
<profile>docker-spark-python-pipelines</profile>
</configuration>
</plugin>
<plugin>
<groupId>${group.fabric8.plugin}</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
<images>
<image>
<name>${project.artifactId}:${project.version}</name>
</image>
</images>
</configuration>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>ci</id>
<build>
<plugins>
<plugin>
<groupId>${group.fabric8.plugin}</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<skip>false</skip>
<images>
<image>
<name>${docker.project.repository.url}${project.artifactId}:${project.version}</name>
</image>
</images>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>${group.fabric8.plugin}</groupId>
<artifactId>docker-maven-plugin</artifactId>
<configuration>
<skip>false</skip>
<images>
<image>
<name>${docker.project.repository.url}${project.artifactId}:${project.version}</name>
</image>
</images>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>
</profiles>
Expand Down
4 changes: 4 additions & 0 deletions ...tion/foundation-mda/src/main/resources/templates/general-docker/airflow.docker.pom.xml.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>${group.fabric8.plugin}</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand Down
4 changes: 4 additions & 0 deletions ...mda/src/main/resources/templates/general-docker/custom.lineage.consumer.docker.pom.xml.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>${group.fabric8.plugin}</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
4 changes: 4 additions & 0 deletions .../foundation-mda/src/main/resources/templates/general-docker/data.access.docker.pom.xml.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>${group.fabric8.plugin}</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand Down
173 changes: 88 additions & 85 deletions ...on/foundation-mda/src/main/resources/templates/general-docker/inference.docker.pom.xml.vm
View file
Original file line number Diff line number Diff line change
@@ -1,93 +1,96 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>${groupId}</groupId>
<artifactId>${parentArtifactId}</artifactId>
<version>${version}</version>
</parent>
<parent>
<groupId>${groupId}</groupId>
<artifactId>${parentArtifactId}</artifactId>
<version>${version}</version>
</parent>

<artifactId>${artifactId}</artifactId>
<artifactId>${artifactId}</artifactId>

<packaging>docker-build</packaging>
<packaging>docker-build</packaging>

<name>${parentDescriptiveName}::Inference</name>
<description>Build for an Inference Docker container to run a compliant inference service</description>

<build>
<plugins>
<plugin>
<groupId>org.technologybrewery.fermenter</groupId>
<artifactId>fermenter-mda</artifactId>
<configuration>
<basePackage>${basePackage}</basePackage>
<profile>aissemble-inference-docker</profile>
<propertyVariables>
<dockerProjectRepositoryUrl>${docker.project.repository.url}</dockerProjectRepositoryUrl>
</propertyVariables>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-docker-resources</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/main/resources/docker</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-${inferencePipeline.stepArtifactId}</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/${inferencePipeline.stepArtifactId}</outputDirectory>
<resources>
<resource>
<directory>${project.parent.parent.basedir}/${rootArtifactId}-pipelines/${inferencePipeline.pipelineArtifactId}/${inferencePipeline.stepArtifactId}</directory>
<filtering>false</filtering>
<includes>
<include>dist/requirements.txt</include>
<include>dist/*-${version.habushu.dist.artifact}-*.whl</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-config-resources</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/krausening/base</outputDirectory>
<resources>
<resource>
<directory>${project.parent.parent.basedir}/${rootArtifactId}-pipelines/${inferencePipeline.pipelineArtifactId}/${inferencePipeline.stepArtifactId}/src/${inferenceModuleSnakeCase}/resources/krausening/base</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<name>${parentDescriptiveName}::Inference</name>
<description>Build for an Inference Docker container to run a compliant inference service</description>

<build>
<plugins>
<plugin>
<groupId>org.technologybrewery.fermenter</groupId>
<artifactId>fermenter-mda</artifactId>
<configuration>
<basePackage>${basePackage}</basePackage>
<profile>aissemble-inference-docker</profile>
<propertyVariables>
<dockerProjectRepositoryUrl>${docker.project.repository.url}</dockerProjectRepositoryUrl>
</propertyVariables>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-docker-resources</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/main/resources/docker</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-${inferencePipeline.stepArtifactId}</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/${inferencePipeline.stepArtifactId}</outputDirectory>
<resources>
<resource>
<directory>${project.parent.parent.basedir}/${rootArtifactId}-pipelines/${inferencePipeline.pipelineArtifactId}/${inferencePipeline.stepArtifactId}</directory>
<filtering>false</filtering>
<includes>
<include>dist/requirements.txt</include>
<include>dist/*-${version.habushu.dist.artifact}-*.whl</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-config-resources</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/krausening/base</outputDirectory>
<resources>
<resource>
<directory>${project.parent.parent.basedir}/${rootArtifactId}-pipelines/${inferencePipeline.pipelineArtifactId}/${inferencePipeline.stepArtifactId}/src/${inferenceModuleSnakeCase}/resources/krausening/base</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>${group.fabric8.plugin}</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
3 changes: 1 addition & 2 deletions foundation/foundation-mda/src/main/resources/templates/general-docker/it.java.docker.file.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
# GENERATED DOCKERFILE - please ***DO*** modify.
#
# Generated from: ${templateName}
ARG DOCKER_BASELINE_REPO_ID
FROM ${DOCKER_BASELINE_REPO_ID}boozallen/openjdk:11-slim
FROM openjdk:11-slim

COPY ./target/specifications/ ./specifications
COPY ./target/${artifactId}.jar ./
4 changes: 4 additions & 0 deletions ...ation/foundation-mda/src/main/resources/templates/general-docker/mlflow.docker.pom.xml.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>${group.fabric8.plugin}</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand Down
4 changes: 4 additions & 0 deletions ...n-mda/src/main/resources/templates/general-docker/policy.decision.point.docker.pom.xml.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>${group.fabric8.plugin}</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand Down
4 changes: 4 additions & 0 deletions ...foundation-mda/src/main/resources/templates/general-docker/spark-worker.docker.pom.xml.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
</dependency>
</dependencies>
</plugin>
<plugin>
<groupId>${group.fabric8.plugin}</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
<dependencies>
Expand Down
Loading

0 comments on commit 24d66e9

Please sign in to comment.