diff --git a/exomiser-cli/pom.xml b/exomiser-cli/pom.xml index 5a39f2b97..10954f84b 100644 --- a/exomiser-cli/pom.xml +++ b/exomiser-cli/pom.xml @@ -201,15 +201,13 @@ docker:bash - eclipse-temurin:17.0.6_10-jre - + eclipse-temurin:17.0.6_10-jre com.google.cloud.tools jib-maven-plugin - 3.3.0 build-docker-image @@ -273,17 +271,11 @@ docker:distroless - - - gcr.io/distroless/java17-debian11@sha256:d5a7bb2b1bcd09d9b7ba7f7b13df39cbb2ab2ff73a0ab834a5769e59229af2f8 - - com.google.cloud.tools jib-maven-plugin - 3.3.0 build-docker-image diff --git a/exomiser-web/pom.xml b/exomiser-web/pom.xml index 2b8061493..45808f939 100644 --- a/exomiser-web/pom.xml +++ b/exomiser-web/pom.xml @@ -140,43 +140,62 @@ - - com.google.cloud.tools - jib-maven-plugin - 3.3.1 - - - install - - buildTar - - - - - - ${docker.base.image} - - - amd64 - linux - - - - - ${project.artifactId}:${project.parent.version} - - ${project.parent.version} - latest - - - - - /exomiser-data - /exomiser - - - - + + + docker:web-build + + + + com.google.cloud.tools + jib-maven-plugin + + + build-docker-image + package + + build + + + + + ${docker.base.image} + + + + linux + arm64 + + + linux + amd64 + + + + + + ${docker.registry}/${docker.repository}/${project.artifactId}:${project.parent.version} + + + latest + latest-distroless + ${project.parent.version}-distroless + + + + + /exomiser-data + /exomiser + /results + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 4aa180ed4..81fec48d8 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ 3.21.12 2.7.7 - gcr.io/distroless/java17@sha256:ab37242e81cbc031b2600eef4440fe87055a05c14b40686df85078cc5086c98f + gcr.io/distroless/java17-debian11@sha256:d5a7bb2b1bcd09d9b7ba7f7b13df39cbb2ab2ff73a0ab834a5769e59229af2f8 docker.io exomiser @@ -223,6 +223,15 @@ + + + + com.google.cloud.tools + jib-maven-plugin + 3.3.0 + + +