diff --git a/.gitignore b/.gitignore index 41f692f8929306bf0430e65bcc8eccb01e92fd02..c10edf4e5214be3a14fbe0fa4512f95f87fd6662 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ .factorypath target + +.idea +*.iml diff --git a/jenkins/jenkins-build-agent-jdk-11/readme.md b/jenkins/jenkins-build-agent-jdk-11/readme.md index eaf4db5de0b82e1c2746f3577da40b46f32e5e71..94a786a6fe798311a0ff94249df373c47988794e 100644 --- a/jenkins/jenkins-build-agent-jdk-11/readme.md +++ b/jenkins/jenkins-build-agent-jdk-11/readme.md @@ -2,8 +2,9 @@ # Image bauen -`docker build -t docker.ozg-sh.de/jenkins-build-agent-jdk-11 .` + docker build -t docker.ozg-sh.de/jenkins-build-agent-jdk-11 . # push - docker push docker.ozg-sh.de/jenkins-build-agent-jdk-11 \ No newline at end of file + docker push docker.ozg-sh.de/jenkins-build-agent-jdk-11 + diff --git a/jenkins/jenkins-build-agent/Dockerfile b/jenkins/jenkins-build-agent/Dockerfile index 79573cc47e1b1f44e8f67973c17597cc6aac2939..330d30ac2abefb8a56543cf90dba3db5994eb7c5 100644 --- a/jenkins/jenkins-build-agent/Dockerfile +++ b/jenkins/jenkins-build-agent/Dockerfile @@ -5,6 +5,7 @@ ARG OPENJDK_VERSION=17 ARG NODEJS_VERSION=v14.15.1 ARG KUBECTL_VERSION=v1.25.0 ARG HELM_VERSION=3 +ARG HELM_UNITTEST_VERSION=0.2.11 ENV LANG C.UTF-8 @@ -54,7 +55,7 @@ RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-${HEL && ./get-helm.sh \ && rm get-helm.sh -RUN helm plugin install https://github.com/quintush/helm-unittest +RUN helm plugin install https://github.com/quintush/helm-unittest --version=${HELM_UNITTEST_VERSION} RUN wget https://get.docker.com -O get-docker.sh \ && chmod +x get-docker.sh \ diff --git a/jenkins/jenkins-build-agent/readme.md b/jenkins/jenkins-build-agent/readme.md index 68707622d33cc919ae3700e72e1631cf3bf99b38..8dff04761b2c717608b1ec4b316253334a35faa9 100644 --- a/jenkins/jenkins-build-agent/readme.md +++ b/jenkins/jenkins-build-agent/readme.md @@ -1,12 +1,9 @@ # Image bauen -`docker build -t docker.ozg-sh.de/jenkins-build-agent .` - -docker.ozg-sh.de/jenkins-build-agent - + docker build -t docker.ozg-sh.de/jenkins-build-agent:node-14-15-1 . -Aktuell wird wohl das hier genutzt lauf Jenkinsfiles: +# push - docker build -t docker.ozg-sh.de/jenkins-build-agent:node-14-15-1 . - docker push docker.ozg-sh.de/jenkins-build-agent:node-14-15-1 \ No newline at end of file + docker push docker.ozg-sh.de/jenkins-build-agent:node-14-15-1 + \ No newline at end of file diff --git a/jenkins/jenkins-quarkus-build-agent/Dockerfile b/jenkins/jenkins-quarkus-build-agent/Dockerfile index eea33f64ce950eb2af7ce788cd418d122f491a04..11c33750ec57d99962e1496ad7c325c4eb7352a6 100644 --- a/jenkins/jenkins-quarkus-build-agent/Dockerfile +++ b/jenkins/jenkins-quarkus-build-agent/Dockerfile @@ -2,6 +2,7 @@ FROM ubuntu:22.04 ARG OPENJDK_VERSION=17 ARG HELM_VERSION=3 +ARG HELM_UNITTEST_VERSION=0.2.11 ENV LANG C.UTF-8 @@ -20,7 +21,7 @@ RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-${HEL && ./get-helm.sh \ && rm get-helm.sh -RUN helm plugin install https://github.com/quintush/helm-unittest +RUN helm plugin install https://github.com/quintush/helm-unittest --version=${HELM_UNITTEST_VERSION} RUN wget https://get.docker.com -O get-docker.sh \ && chmod +x get-docker.sh \ diff --git a/jenkins/jenkins-quarkus-build-agent/readme.md b/jenkins/jenkins-quarkus-build-agent/readme.md index 67ac07943eda6c6474df7d718741dd978d9b2d25..ba5611b08f8456632094a064356151ba0469d2be 100644 --- a/jenkins/jenkins-quarkus-build-agent/readme.md +++ b/jenkins/jenkins-quarkus-build-agent/readme.md @@ -1,3 +1,7 @@ # Image bauen -`docker build -t docker.ozg-sh.de/jenkins-quarkus-build-agent .` + docker build -t docker.ozg-sh.de/jenkins-quarkus-build-agent . + +# push + + docker push docker.ozg-sh.de/jenkins-quarkus-build-agent diff --git a/kop-common-dependencies/pom.xml b/kop-common-dependencies/pom.xml index 47d050f3a055663259ec9394cdf56c558de31139..ce7e9714a6c79d00ddfcd14f3bce474039258929 100644 --- a/kop-common-dependencies/pom.xml +++ b/kop-common-dependencies/pom.xml @@ -71,6 +71,8 @@ <keycloak-spring-boot-starter.version>18.0.0</keycloak-spring-boot-starter.version> <jakarta.version>2.1.0</jakarta.version> + <quarkus.platform.version>2.16.7.Final</quarkus.platform.version> + <!-- Test --> <lorem.version>2.1</lorem.version> <faker.version>1.0.2</faker.version> @@ -262,6 +264,15 @@ <version>${faker.version}</version> <scope>test</scope> </dependency> + + <!-- Quarkus --> + <dependency> + <groupId>io.quarkus.platform</groupId> + <artifactId>quarkus-bom</artifactId> + <version>${quarkus.platform.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> </dependencies> </dependencyManagement>