Skip to content

Commit

Permalink
[#320] fix docker plugin config to account for change from orphedomos
Browse files Browse the repository at this point in the history
  • Loading branch information
@ewilkins-csi
ewilkins-csi committed Sep 10, 2024
1 parent 7343409 commit d3f4d90
Show file tree
Hide file tree
Showing 42 changed files with 1,755 additions and 147 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
85 changes: 44 additions & 41 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
Expand Up @@ -49,45 +49,48 @@
</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>

<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>
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
140 changes: 72 additions & 68 deletions ...ion/foundation-mda/src/main/resources/templates/general-docker/training.docker.pom.xml.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,73 +17,77 @@
<name>${parentDescriptiveName}::Training</name>
<description>Build for a Training Docker container to run a model training job</description>

<build>
<plugins>
<plugin>
<groupId>org.technologybrewery.fermenter</groupId>
<artifactId>fermenter-mda</artifactId>
<configuration>
<basePackage>${basePackage}</basePackage>
<profile>aissemble-training-docker</profile>
</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-${trainingPipeline.stepArtifactId}</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/${trainingPipeline.stepArtifactId}</outputDirectory>
<resources>
<resource>
<directory>${project.parent.parent.basedir}/${rootArtifactId}-pipelines/${trainingPipeline.pipelineArtifactId}/${trainingPipeline.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/${trainingPipeline.pipelineArtifactId}/${trainingPipeline.stepArtifactId}/src/${trainingModuleSnakeCase}/resources/krausening/base</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<build>
<plugins>
<plugin>
<groupId>org.technologybrewery.fermenter</groupId>
<artifactId>fermenter-mda</artifactId>
<configuration>
<basePackage>${basePackage}</basePackage>
<profile>aissemble-training-docker</profile>
</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-${trainingPipeline.stepArtifactId}</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/${trainingPipeline.stepArtifactId}</outputDirectory>
<resources>
<resource>
<directory>${project.parent.parent.basedir}/${rootArtifactId}-pipelines/${trainingPipeline.pipelineArtifactId}/${trainingPipeline.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/${trainingPipeline.pipelineArtifactId}/${trainingPipeline.stepArtifactId}/src/${trainingModuleSnakeCase}/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>
4 changes: 4 additions & 0 deletions ...dation/foundation-mda/src/main/resources/templates/general-docker/vault.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/foundation-mda/src/main/resources/templates/general-docker/versioning.docker.pom.xml.vm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>${group.fabric8.plugin}</groupId>
<artifactId>docker-maven-plugin</artifactId>
</plugin>
</plugins>
</build>

Expand Down
Loading

0 comments on commit d3f4d90

Please sign in to comment.