diff options
Diffstat (limited to 'policy-jdk')
| -rw-r--r-- | policy-jdk/alpine/pom.xml | 104 | ||||
| -rw-r--r-- | policy-jdk/alpine/src/main/docker/Dockerfile | 5 |
2 files changed, 101 insertions, 8 deletions
diff --git a/policy-jdk/alpine/pom.xml b/policy-jdk/alpine/pom.xml index d5f1e3cd..c8e10775 100644 --- a/policy-jdk/alpine/pom.xml +++ b/policy-jdk/alpine/pom.xml @@ -20,8 +20,7 @@ ============LICENSE_END========================================================= --> -<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"> +<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> @@ -38,8 +37,95 @@ <properties> <docker.jdk.imagename>onap/policy-jdk-alpine</docker.jdk.imagename> + <integration.python.name>onap/integration-python</integration.python.name> + <integration.python.version>10.1.0</integration.python.version> </properties> + <profiles> + <profile> + <!-- This profile is activated on Apple M1 architecture to generate the ONAP base Java image locally --> + <id>baseImage</id> + <activation> + <os> + <arch>aarch64</arch> + </os> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-plugin</artifactId> + <version>1.13.0</version> + <dependencies> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>3.4.2</version> + </dependency> + <dependency> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-provider-gitexe</artifactId> + <version>1.13.0</version> + </dependency> + </dependencies> + <configuration> + <connectionType>connection</connectionType> + <checkoutDirectory>src/main/resources/meta</checkoutDirectory> + </configuration> + <executions> + <execution> + <id>checkout-onap-python</id> + <phase>validate</phase> + <configuration> + <connectionUrl>scm:git:https://gerrit.onap.org/r/integration/docker/onap-python</connectionUrl> + <checkoutDirectory>${project.build.directory}/onap-python</checkoutDirectory> + </configuration> + <goals> + <goal>checkout</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>io.fabric8</groupId> + <artifactId>docker-maven-plugin</artifactId> + + <executions> + <execution> + <id>generate-python-image</id> + <phase>initialize</phase> + <configuration> + <verbose>true</verbose> + <apiVersion>1.23</apiVersion> + <pullRegistry>${docker.pull.registry}</pullRegistry> + <pushRegistry>${docker.push.registry}</pushRegistry> + <images> + <image> + <name>${integration.python.name}</name> + <build> + <cleanup>try</cleanup> + <contextDir>${project.build.directory}/onap-python</contextDir> + <dockerFile>Dockerfile</dockerFile> + <tags> + <tag>${integration.python.version}</tag> + <tag>${integration.python.version}-${maven.build.timestamp}</tag> + <tag>${project.docker.latest.minmax.tag.version}</tag> + </tags> + </build> + </image> + </images> + </configuration> + <goals> + <goal>build</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + <build> <finalName>${project.artifactId}-${project.version}</finalName> <plugins> @@ -83,6 +169,10 @@ <tag>${project.version}-${maven.build.timestamp}</tag> <tag>${project.docker.latest.minmax.tag.version}</tag> </tags> + <args> + <INTEGRATION_PYTHON_NAME>${integration.python.name}</INTEGRATION_PYTHON_NAME> + <INTEGRATION_PYTHON_VERSION>${integration.python.version}</INTEGRATION_PYTHON_VERSION> + </args> </build> </image> </images> @@ -91,7 +181,7 @@ <executions> <execution> <id>clean-images</id> - <phase>pre-clean</phase> + <phase>prepare-jdk-package</phase> <goals> <goal>remove</goal> </goals> @@ -101,15 +191,15 @@ </execution> <execution> - <id>generate-images</id> - <phase>generate-sources</phase> + <id>generate-jdk-images</id> + <phase>package</phase> <goals> <goal>build</goal> </goals> </execution> <execution> - <id>push-images</id> + <id>push-jdk-images</id> <phase>deploy</phase> <goals> <goal>build</goal> @@ -137,4 +227,4 @@ </plugin> </plugins> </build> -</project> +</project>
\ No newline at end of file diff --git a/policy-jdk/alpine/src/main/docker/Dockerfile b/policy-jdk/alpine/src/main/docker/Dockerfile index c6c492b9..a8f84c0c 100644 --- a/policy-jdk/alpine/src/main/docker/Dockerfile +++ b/policy-jdk/alpine/src/main/docker/Dockerfile @@ -23,7 +23,10 @@ # $JAVA_HOME is set to /usr/lib/jvm/java-11-openjdk # more details at https://hub.docker.com/_/openjdk -FROM onap/integration-python:10.1.0 +ARG INTEGRATION_PYTHON_NAME=${INTEGRATION_PYTHON_NAME} +ARG INTEGRATION_PYTHON_VERSION=${INTEGRATION_PYTHON_VERSION} + +FROM ${INTEGRATION_PYTHON_NAME}:${INTEGRATION_PYTHON_VERSION} LABEL maintainer="Policy Team" LABEL org.opencontainers.image.title="Policy JDK Alpine" |