diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f31b7d813ebcba125387e5edd909cf01b46ec94..2fccb5d3081d485b6b21649db2b976ea2e457a5f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,6 +28,8 @@ maven-build:
- 'echo "with Maven goal: $MAVEN_GOAL"'
- 'mvn $MAVEN_CLI_OPTS $MAVEN_GOAL -PskipAll -Dxplan-tests.maven.deploy.skip=true'
rules:
+ - if: $OPERATION != null
+ when: never
- if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH
variables:
MAVEN_GOAL: "install"
@@ -39,7 +41,7 @@ maven-build:
stage: build:java4docker
image: registry.opencode.de/diplanung/ozgxplanung/mvn-build-image:latest
script:
- - 'mvn package -Dxplan-tests.maven.deploy.skip=true -Pdocker,skipping -pl $mvnProjects -am'
+ - mvn package -Dxplan-tests.maven.deploy.skip=true -Pdocker,skipAll -pl $mvnProjects -am
- find . -name docker-build.tar | xargs gzip
- set -o pipefail; find . -name docker-build.tar.gz | grep . | xargs du -h
rules:
@@ -53,13 +55,14 @@ maven-build:
variables:
UPSTREAM_REF: $CI_COMMIT_REF_NAME
-maven-prepare-docker-contexts-apis:
+maven-prepare-docker-contexts-apis-and-inspire-plu:
extends: .maven-prepare-docker-contexts
variables:
- mvnProjects: ':xplan-api-validator,:xplan-api-manager,:xplan-api-dokumente'
+ mvnProjects: ':xplan-api-validator,:xplan-api-manager,:xplan-api-dokumente,:xplan-inspireplu'
artifacts:
paths:
- './xplan-api/**/target/docker/**/tmp/docker-build.tar.gz'
+ - './xplan-webservices/xplan-inspireplu/target/docker/**/docker-build.tar.gz'
maven-prepare-docker-contexts-cli:
extends: .maven-prepare-docker-contexts
@@ -72,11 +75,12 @@ maven-prepare-docker-contexts-cli:
maven-prepare-docker-contexts-web-apps:
extends: .maven-prepare-docker-contexts
variables:
- mvnProjects: ':xplan-manager-web,:xplan-validator-web'
+ mvnProjects: ':xplan-manager-web,:xplan-validator-web,:xplan-root'
artifacts:
paths:
- './xplan-webapps/xplan-manager-web/**/target/docker/**/tmp/docker-build.tar.gz'
- './xplan-webapps/xplan-validator-web/**/target/docker/**/tmp/docker-build.tar.gz'
+ - './xplan-webapps/xplan-root/**/target/docker/**/tmp/docker-build.tar.gz'
maven-prepare-docker-contexts-others:
extends: .maven-prepare-docker-contexts
@@ -114,7 +118,7 @@ gitlab-release:
stage: deploy
image: registry.gitlab.com/gitlab-org/release-cli:latest
rules:
- - if: $CI_PIPELINE_SOURCE == 'schedule'
+ - if: $OPERATION != null
when: never
- if: $CI_COMMIT_TAG
script:
@@ -134,7 +138,7 @@ create-maven-build-image:
script:
- /kaniko/executor
--context "${CI_PROJECT_DIR}"
- --dockerfile "${CI_PROJECT_DIR}/ci/mvnBuildImage.Dockerfile"
+ --dockerfile "${CI_PROJECT_DIR}/ci/mvn-build-image.Dockerfile"
--destination "${CI_REGISTRY_IMAGE}/mvn-build-image:latest"
--cache=true --compressed-caching=false --use-new-run --cleanup
rules:
diff --git a/ci/all-kaniko-builds.gitlab-ci.yml b/ci/all-kaniko-builds.gitlab-ci.yml
index 74b3fd84dc7fec35637a907bbd9ac74026a09191..959dd308c367fae55177ae6214c287b2d037bcc4 100644
--- a/ci/all-kaniko-builds.gitlab-ci.yml
+++ b/ci/all-kaniko-builds.gitlab-ci.yml
@@ -18,10 +18,19 @@
when: never
- when: on_success
variables:
+ GIT_STRATEGY: none
destination: ${CI_REGISTRY_IMAGE}/xplanbox/${dockerImageName}
## job per image to produce
+kaniko:xplan-cli-docker:
+ extends: .kaniko:build
+ variables:
+ dockerImageName: xplan-cli-docker
+ tarGzFile: xplan-cli/xplan-cli-docker/target/docker/xplanbox/xplan-cli/tmp/docker-build.tar.gz
+ needs:
+ - maven-prepare-docker-contexts-cli
+
kaniko:xplan-db-updater:
extends: .kaniko:build
variables:
@@ -58,19 +67,27 @@ kaniko:xplan-docker-volume-init:
kaniko:xplan-dokumente-api:
extends: .kaniko:build
variables:
- dockerImageName: xplan-validator-api
+ dockerImageName: xplan-dokumente-api
tarGzFile: xplan-api/xplan-api-dokumente/target/docker/xplanbox/xplan-dokumente-api/tmp/docker-build.tar.gz
needs:
- - maven-prepare-docker-contexts-apis
+ - maven-prepare-docker-contexts-apis-and-inspire-plu
- kaniko:xplan-docker-tomcat
+kaniko:xplan-inspireplu:
+ extends: .kaniko:build
+ variables:
+ dockerImageName: xplan-inspireplu
+ tarGzFile: xplan-webservices/xplan-inspireplu/target/docker/xplanbox/xplan-inspireplu/tmp/docker-build.tar.gz
+ needs:
+ - maven-prepare-docker-contexts-apis-and-inspire-plu
+
kaniko:xplan-manager-api:
extends: .kaniko:build
variables:
dockerImageName: xplan-manager-api
tarGzFile: xplan-api/xplan-api-manager/target/docker/xplanbox/xplan-manager-api/tmp/docker-build.tar.gz
needs:
- - maven-prepare-docker-contexts-apis
+ - maven-prepare-docker-contexts-apis-and-inspire-plu
- kaniko:xplan-docker-tomcat-gdal
kaniko:xplan-mapserver:
@@ -90,6 +107,14 @@ kaniko:xplan-manager-web:
- maven-prepare-docker-contexts-web-apps
- kaniko:xplan-docker-tomcat-gdal
+kaniko:xplan-root:
+ extends: .kaniko:build
+ variables:
+ dockerImageName: xplan-root
+ tarGzFile: xplan-webapps/xplan-root/target/docker/xplanbox/xplan-root/tmp/docker-build.tar.gz
+ needs:
+ - maven-prepare-docker-contexts-web-apps
+
kaniko:xplan-services:
extends: .kaniko:build
variables:
@@ -113,7 +138,7 @@ kaniko:xplan-validator-api:
dockerImageName: xplan-validator-api
tarGzFile: xplan-api/xplan-api-validator/target/docker/xplanbox/xplan-validator-api/tmp/docker-build.tar.gz
needs:
- - maven-prepare-docker-contexts-apis
+ - maven-prepare-docker-contexts-apis-and-inspire-plu
- kaniko:xplan-docker-tomcat
@@ -133,4 +158,4 @@ kaniko:xplan-validator-wms:
tarGzFile: xplan-webservices/xplan-validator-wms/target/docker/xplanbox/xplan-validator-wms/tmp/docker-build.tar.gz
needs:
- maven-prepare-docker-contexts-others
- - kaniko:xplan-docker-tomcat
\ No newline at end of file
+ - kaniko:xplan-docker-tomcat
diff --git a/pom.xml b/pom.xml
index 8647a0617bd7f3f1db589a5255d9ba44a457f7c0..0e35cae3505640698899d494ef32fef70e13a874 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,8 @@
<build-date-utc>${maven.build.timestamp}Z</build-date-utc>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<dependency-check.skip>true</dependency-check.skip>
+ <docker-image.skip>true</docker-image.skip>
+ <docker-image.skip-sources>${docker-image.skip}</docker-image.skip-sources>
</properties>
<modules>
@@ -220,8 +222,6 @@
<profile>
<id>docker</id>
<properties>
- <docker-image.skip>true</docker-image.skip>
- <docker-image.skip-sources>${docker-image.skip}</docker-image.skip-sources>
<docker-image.namePrefix>xplanbox</docker-image.namePrefix>
<docker-image.name>${project.artifactId}</docker-image.name>
</properties>
@@ -229,59 +229,50 @@
<module>xplan-docker</module>
</modules>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>io.fabric8</groupId>
- <artifactId>docker-maven-plugin</artifactId>
- <version>0.43.4</version>
- <configuration>
- <skip>${docker-image.skip}</skip>
- <images>
- <image>
- <name>${docker-image.namePrefix}/${docker-image.name}</name>
- <build>
- <dockerFileDir>${project.basedir}</dockerFileDir>
- <args>
- <BUILD_DATE>'${build-date-utc}'</BUILD_DATE>
- <DOCKER_IMAGE_NAME>${docker-image.name}</DOCKER_IMAGE_NAME>
- <GIT_REVISION>${git.commit.id}</GIT_REVISION>
- <WEB_CONTEXT>${project.artifactId}</WEB_CONTEXT>
- <XPLANBOX_VERSION>${project.version}</XPLANBOX_VERSION>
- <XPLANBOX_IMAGE_NAME_PREFIX>${docker-image.namePrefix}</XPLANBOX_IMAGE_NAME_PREFIX>
- </args>
- <tags>
- <tag>${project.version}</tag>
- </tags>
- </build>
- </image>
- </images>
- </configuration>
- <executions>
- <execution>
- <id>context-sources</id>
- <goals>
- <goal>source</goal>
- </goals>
- <configuration>
- <skip>${docker-image.skip-sources}</skip>
- </configuration>
- </execution>
- <execution>
- <id>default</id>
- <goals>
- <goal>build</goal>
- <goal>push</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
+ <configuration>
+ <skip>${docker-image.skip}</skip>
+ <images>
+ <image>
+ <name>${docker-image.namePrefix}/${docker-image.name}</name>
+ <build>
+ <dockerFileDir>${project.basedir}</dockerFileDir>
+ <args>
+ <BUILD_DATE>'${build-date-utc}'</BUILD_DATE>
+ <DOCKER_IMAGE_NAME>${docker-image.name}</DOCKER_IMAGE_NAME>
+ <GIT_REVISION>${git.commit.id}</GIT_REVISION>
+ <WEB_CONTEXT>${project.artifactId}</WEB_CONTEXT>
+ <XPLANBOX_VERSION>${project.version}</XPLANBOX_VERSION>
+ <XPLANBOX_IMAGE_NAME_PREFIX>${docker-image.namePrefix}</XPLANBOX_IMAGE_NAME_PREFIX>
+ </args>
+ <tags>
+ <tag>${project.version}</tag>
+ </tags>
+ </build>
+ </image>
+ </images>
+ </configuration>
+ <executions>
+ <execution>
+ <id>context-sources</id>
+ <goals>
+ <goal>source</goal>
+ </goals>
+ <configuration>
+ <skip>${docker-image.skip-sources}</skip>
+ </configuration>
+ </execution>
+ <execution>
+ <id>default</id>
+ <goals>
+ <goal>build</goal>
+ <goal>push</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
@@ -666,6 +657,11 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
</plugin>
+ <plugin>
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <version>0.43.4</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/xplan-api/xplan-api-dokumente/.maven-dockerignore b/xplan-api/xplan-api-dokumente/.maven-dockerignore
index dcaef1c41403d9f26a226dc71e60d2c7a803c9c9..c31d316e2fa767833ca4d802db7c259b5dd61b02 100644
--- a/xplan-api/xplan-api-dokumente/.maven-dockerignore
+++ b/xplan-api/xplan-api-dokumente/.maven-dockerignore
@@ -5,6 +5,7 @@
pom.xml
src/**
+target/*.jar.original
target/classes/**
target/dependency-maven-plugin-markers/**
target/docker
diff --git a/xplan-api/xplan-api-dokumente/Dockerfile b/xplan-api/xplan-api-dokumente/Dockerfile
index 45896f263ed83931f779ed722d6d169d2c3b9a9e..aa8aa56441931585e819af929aa29f408d782643 100644
--- a/xplan-api/xplan-api-dokumente/Dockerfile
+++ b/xplan-api/xplan-api-dokumente/Dockerfile
@@ -3,7 +3,7 @@ ARG XPLANBOX_IMAGE_NAME_PREFIX=xplanbox
FROM ${XPLANBOX_IMAGE_NAME_PREFIX}/xplan-docker-tomcat:$XPLANBOX_VERSION as builder
-FROM eclipse-temurin:11.0.17_8-jre-alpine
+FROM eclipse-temurin:11.0.21_9-jre-alpine
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
diff --git a/xplan-api/xplan-api-dokumente/pom.xml b/xplan-api/xplan-api-dokumente/pom.xml
index 9784fbf6f7d74e15d8adda2beda6089a89b715e4..9077b397a8a9e1fe9792c8f090fad96ec24b296f 100755
--- a/xplan-api/xplan-api-dokumente/pom.xml
+++ b/xplan-api/xplan-api-dokumente/pom.xml
@@ -35,6 +35,21 @@
</execution>
</executions>
</plugin>
+ <plugin><!-- redeclare here to run *after* spring-boot repackage -->
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>context-sources</id>
+ <goals>
+ <goal>source</goal>
+ </goals>
+ <configuration>
+ <skip>${docker-image.skip-sources}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/xplan-api/xplan-api-manager/.maven-dockerignore b/xplan-api/xplan-api-manager/.maven-dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..c31d316e2fa767833ca4d802db7c259b5dd61b02
--- /dev/null
+++ b/xplan-api/xplan-api-manager/.maven-dockerignore
@@ -0,0 +1,18 @@
+.classpath
+.dockerignore
+.project
+.settings/**
+
+pom.xml
+src/**
+target/*.jar.original
+target/classes/**
+target/dependency-maven-plugin-markers/**
+target/docker
+target/generated-sources/**
+target/generated-test-sources/**
+target/m2e-wtp/**
+target/maven-*/**
+target/surefire-reports/**
+target/test-classes/**
+target/xplan-api-dokumente-*/*/**
\ No newline at end of file
diff --git a/xplan-api/xplan-api-manager/pom.xml b/xplan-api/xplan-api-manager/pom.xml
index 34cd529ad514383f274f6cc5751161361e3acd1b..0f95df35f061cd17c663da5f5bf2f0b776f94f61 100644
--- a/xplan-api/xplan-api-manager/pom.xml
+++ b/xplan-api/xplan-api-manager/pom.xml
@@ -35,6 +35,21 @@
</execution>
</executions>
</plugin>
+ <plugin><!-- redeclare here to run *after* spring-boot repackage -->
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>context-sources</id>
+ <goals>
+ <goal>source</goal>
+ </goals>
+ <configuration>
+ <skip>${docker-image.skip-sources}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/xplan-api/xplan-api-validator/.maven-dockerignore b/xplan-api/xplan-api-validator/.maven-dockerignore
index 0099735fedd7d8ea2e643633edd353e614ec6d1d..c10873ac5b13bb0a3559ff43e4c9e9c44dc63b3a 100644
--- a/xplan-api/xplan-api-validator/.maven-dockerignore
+++ b/xplan-api/xplan-api-validator/.maven-dockerignore
@@ -6,6 +6,7 @@
pom.xml
src/**
+target/*.jar.original
target/classes/**
target/dependency-maven-plugin-markers/**
target/docker
@@ -15,4 +16,4 @@ target/m2e-wtp/**
target/maven-*/**
target/surefire-reports/**
target/test-classes/**
-target/xplan-api-validator-*/*/**
\ No newline at end of file
+target/xplan-api-validator-*/*/**
diff --git a/xplan-api/xplan-api-validator/Dockerfile b/xplan-api/xplan-api-validator/Dockerfile
index 08da1a86dba0d10e90d838344da30f6a065114de..c236f94bbda1070691df8d17b1c1d871da7d4ba9 100644
--- a/xplan-api/xplan-api-validator/Dockerfile
+++ b/xplan-api/xplan-api-validator/Dockerfile
@@ -3,7 +3,7 @@ ARG XPLANBOX_IMAGE_NAME_PREFIX=xplanbox
FROM ${XPLANBOX_IMAGE_NAME_PREFIX}/xplan-docker-tomcat:$XPLANBOX_VERSION as builder
-FROM eclipse-temurin:11.0.17_8-jre-alpine
+FROM eclipse-temurin:11.0.21_9-jre-alpine
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
diff --git a/xplan-api/xplan-api-validator/pom.xml b/xplan-api/xplan-api-validator/pom.xml
index 0fbe8a8b7b68cd330e3cf35f08d5f535ce745d79..994a97cbff1d6eb5a4c48e451c8a530c7da13736 100755
--- a/xplan-api/xplan-api-validator/pom.xml
+++ b/xplan-api/xplan-api-validator/pom.xml
@@ -79,6 +79,21 @@
</execution>
</executions>
</plugin>
+ <plugin><!-- redeclare here to run *after* spring-boot repackage -->
+ <groupId>io.fabric8</groupId>
+ <artifactId>docker-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>context-sources</id>
+ <goals>
+ <goal>source</goal>
+ </goals>
+ <configuration>
+ <skip>${docker-image.skip-sources}</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/xplan-cli/xplan-cli-docker/Dockerfile b/xplan-cli/xplan-cli-docker/Dockerfile
index 97cbb4c01b860ff146376a4999d5632d5fe4772b..c997b291d974034385c3e08955e0b5473e86d7de 100644
--- a/xplan-cli/xplan-cli-docker/Dockerfile
+++ b/xplan-cli/xplan-cli-docker/Dockerfile
@@ -4,7 +4,7 @@ ARG XPLANBOX_IMAGE_NAME_PREFIX=xplanbox
FROM ${XPLANBOX_IMAGE_NAME_PREFIX}/xplan-docker-volume-init:$XPLANBOX_VERSION as volumeInitBuilder
-FROM eclipse-temurin:11.0.20_8-jdk-alpine
+FROM eclipse-temurin:11.0.21_9-jdk-alpine
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
diff --git a/xplan-docker/xplan-docker-mapproxy/Dockerfile b/xplan-docker/xplan-docker-mapproxy/Dockerfile
index 0131e94c838c2fbdb260b8f3001e322850d1483a..bfb2af988723df3fdea3eab4e5b6c8c02b9f3789 100644
--- a/xplan-docker/xplan-docker-mapproxy/Dockerfile
+++ b/xplan-docker/xplan-docker-mapproxy/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.10-slim
+FROM python:3.10.13-slim
ARG MAPPROXY_VERSION=1.16.0
ARG BUILD_DATE=?
diff --git a/xplan-docker/xplan-docker-mapserver/Dockerfile b/xplan-docker/xplan-docker-mapserver/Dockerfile
index a5f5eea79945a88268038e7fdd0a753d3c67ac9c..96933c7a12c76b43f39df8310519784e68ce742e 100644
--- a/xplan-docker/xplan-docker-mapserver/Dockerfile
+++ b/xplan-docker/xplan-docker-mapserver/Dockerfile
@@ -1,4 +1,5 @@
-FROM camptocamp/mapserver:8.0
+# latest linux/amd64 on 21.11.23
+FROM camptocamp/mapserver@sha256:0ed39cd88641ea384f7ec3ae2cff02c841d7e20d5daea2c4d567e21e53d9c0c2
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
diff --git a/xplan-docker/xplan-docker-tomcat/Dockerfile b/xplan-docker/xplan-docker-tomcat/Dockerfile
index eff296d3ca9a4c6bc5cb5eacf7852ce09a30f5cd..deb6f35010abccf4c6460a81ded37e79444ebcaf 100644
--- a/xplan-docker/xplan-docker-tomcat/Dockerfile
+++ b/xplan-docker/xplan-docker-tomcat/Dockerfile
@@ -1,4 +1,4 @@
-FROM bitnami/tomcat:9.0
+FROM bitnami/tomcat:9.0.83-debian-11-r2
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
diff --git a/xplan-docker/xplan-docker-volume-init/Dockerfile b/xplan-docker/xplan-docker-volume-init/Dockerfile
index ebc2cf0da5b08fea890c4c148f5f233877c21b12..acd974f0b4719181d7dd49bc39f75e237ecd3b59 100644
--- a/xplan-docker/xplan-docker-volume-init/Dockerfile
+++ b/xplan-docker/xplan-docker-volume-init/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.18.4
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
diff --git a/xplan-documentation/xplan-benutzerhandbuch/Dockerfile b/xplan-documentation/xplan-benutzerhandbuch/Dockerfile
index 1f96ab781e72575643073c4c85b1d67a516dd5ef..1932b22fd86a0c5b33e28bdac90aac9052e8910b 100644
--- a/xplan-documentation/xplan-benutzerhandbuch/Dockerfile
+++ b/xplan-documentation/xplan-benutzerhandbuch/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.25-alpine
+FROM nginx:1.25.3-alpine
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
diff --git a/xplan-documentation/xplan-betriebshandbuch/Dockerfile b/xplan-documentation/xplan-betriebshandbuch/Dockerfile
index beee3def20108ecee7d8d5c10a2510a83d57addb..e5ca212bd9ae61c4ba0d7568a950d8579d36e326 100644
--- a/xplan-documentation/xplan-betriebshandbuch/Dockerfile
+++ b/xplan-documentation/xplan-betriebshandbuch/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.25-alpine
+FROM nginx:1.25.3-alpine
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
diff --git a/xplan-resources/xplan-database-scripts/Dockerfile b/xplan-resources/xplan-database-scripts/Dockerfile
index c6721f7abd7462fa077371d0a7a49a7e89bbcd10..04ab499b7123fe82d113a7ad3b2c689ee131624f 100644
--- a/xplan-resources/xplan-database-scripts/Dockerfile
+++ b/xplan-resources/xplan-database-scripts/Dockerfile
@@ -1,4 +1,4 @@
-FROM liquibase/liquibase:4.23
+FROM liquibase/liquibase:4.25.0
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
diff --git a/xplan-resources/xplan-sql-scripts/Dockerfile b/xplan-resources/xplan-sql-scripts/Dockerfile
index 1ba2bf2a247da7d563e59766cece1549861f3f3c..55fa8f6b9cf549c7c551d03c4d80538ec0a4d91a 100644
--- a/xplan-resources/xplan-sql-scripts/Dockerfile
+++ b/xplan-resources/xplan-sql-scripts/Dockerfile
@@ -1,4 +1,4 @@
-FROM postgis/postgis:14-3.3
+FROM postgis/postgis:14-3.4
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
diff --git a/xplan-tests/xplan-tests-soapui/Dockerfile b/xplan-tests/xplan-tests-soapui/Dockerfile
index 12f92144509c91a60cb4a49a95fc910a5358b70a..62d0f254c0d2e7eb258eb8be1679751634cbd6f4 100644
--- a/xplan-tests/xplan-tests-soapui/Dockerfile
+++ b/xplan-tests/xplan-tests-soapui/Dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.9-eclipse-temurin-11-alpine
+FROM maven:3.9.5-eclipse-temurin-11-alpine
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?
diff --git a/xplan-webapps/xplan-root/.maven-dockerignore b/xplan-webapps/xplan-root/.maven-dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..bf89157689f1d2e83851d13358f518d9b4bb775f
--- /dev/null
+++ b/xplan-webapps/xplan-root/.maven-dockerignore
@@ -0,0 +1,8 @@
+.classpath
+.dockerignore
+.project
+.settings/**
+
+pom.xml
+src/**
+target/*.war
\ No newline at end of file
diff --git a/xplan-webapps/xplan-root/Dockerfile b/xplan-webapps/xplan-root/Dockerfile
index b226f9790cdb2956d72d211386385ff2eb1feed2..f0817e221516f6d2a9afd16155078e108cff79bb 100644
--- a/xplan-webapps/xplan-root/Dockerfile
+++ b/xplan-webapps/xplan-root/Dockerfile
@@ -1,4 +1,4 @@
-FROM httpd:2.4
+FROM httpd:2.4.58-alpine
ENV TZ=Europe/Berlin
diff --git a/xplan-webapps/xplan-root/pom.xml b/xplan-webapps/xplan-root/pom.xml
index 3ef23cc357fb2e54ff1b083f9028cacfc7ba7b35..61829acfc90de746bc1dc84eac3deb7289484d0d 100644
--- a/xplan-webapps/xplan-root/pom.xml
+++ b/xplan-webapps/xplan-root/pom.xml
@@ -27,7 +27,7 @@
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
- <phase>package</phase>
+ <phase>prepare-package</phase>
</execution>
<execution>
<id>default</id>
@@ -43,7 +43,7 @@
</descriptors>
<appendAssemblyId>true</appendAssemblyId>
</configuration>
- <phase>package</phase>
+ <phase>prepare-package</phase>
</execution>
</executions>
</plugin>
diff --git a/xplan-webservices/xplan-inspireplu/.maven-dockerignore b/xplan-webservices/xplan-inspireplu/.maven-dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..0f004568998638bfb2b3aac8812a2617bc1f0ec4
--- /dev/null
+++ b/xplan-webservices/xplan-inspireplu/.maven-dockerignore
@@ -0,0 +1,19 @@
+.classpath
+.dockerignore
+.project
+.settings/**
+
+pom.xml
+src/**
+target/*.war
+target/war/**
+target/classes/**
+target/dependency-maven-plugin-markers/**
+target/docker
+target/generated-sources/**
+target/generated-test-sources/**
+target/m2e-wtp/**
+target/maven-*/**
+target/surefire-reports/**
+target/test-classes/**
+target/xplan-api-validator-*/*/**
diff --git a/xplan-webservices/xplan-inspireplu/Dockerfile b/xplan-webservices/xplan-inspireplu/Dockerfile
index a0a295bc1275b5d22383754f79ef2bcd62325011..8d72967bbb542fb3aea24245aac26a02ee1b15bd 100644
--- a/xplan-webservices/xplan-inspireplu/Dockerfile
+++ b/xplan-webservices/xplan-inspireplu/Dockerfile
@@ -1,4 +1,4 @@
-FROM tomcat:9-jdk11
+FROM tomcat:9.0.83-jdk11-temurin-jammy
ARG BUILD_DATE=?
ARG DOCKER_IMAGE_NAME=?
ARG GIT_REVISION=?