diff --git a/jenkins/jenkins-lasttest-agent/Dockerfile b/jenkins/jenkins-lasttest-agent/Dockerfile new file mode 100644 index 0000000000000000000000000000000000000000..78c9456b067977e4a75ce35d42528f40adc87a11 --- /dev/null +++ b/jenkins/jenkins-lasttest-agent/Dockerfile @@ -0,0 +1,31 @@ +FROM ubuntu:22.04 + +ARG K6_VERSION=v0.42.0 +ARG OPENJDK_VERSION=17 +ARG KUBECTL_VERSION=v1.25.0 + +ENV LANG C.UTF-8 + +RUN apt update \ + && apt upgrade -y \ + && apt install -y \ + git \ + openjdk-${OPENJDK_VERSION}-jdk \ + wget \ + openssh-server + +ADD lets-encrypt-staging-root-certs/*.crt /usr/local/share/ca-certificates/ +RUN update-ca-certificates --fresh + +RUN wget https://github.com/grafana/k6/releases/download/${K6_VERSION}/k6-${K6_VERSION}-linux-amd64.tar.gz -O /tmp/k6.tar.gz \ + && tar -xzf /tmp/k6.tar.gz -C /usr/share --strip-components=1 \ + && ln -s /usr/share/k6 /usr/bin/k6 + +RUN wget https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl -O /usr/local/bin/kubectl \ + && chmod 755 /usr/local/bin/kubectl + +RUN mkdir /run/sshd + +EXPOSE 22 + +CMD ["/usr/sbin/sshd", "-D"] \ No newline at end of file diff --git a/jenkins/jenkins-lasttest-agent/lets-encrypt-staging-root-certs/letsencrypt-stg-root-x1.crt b/jenkins/jenkins-lasttest-agent/lets-encrypt-staging-root-certs/letsencrypt-stg-root-x1.crt new file mode 100644 index 0000000000000000000000000000000000000000..37655b25dbc8fb00289fe964a41a290c38b0e285 --- /dev/null +++ b/jenkins/jenkins-lasttest-agent/lets-encrypt-staging-root-certs/letsencrypt-stg-root-x1.crt @@ -0,0 +1,32 @@ +-----BEGIN CERTIFICATE----- +MIIFmDCCA4CgAwIBAgIQU9C87nMpOIFKYpfvOHFHFDANBgkqhkiG9w0BAQsFADBm +MQswCQYDVQQGEwJVUzEzMDEGA1UEChMqKFNUQUdJTkcpIEludGVybmV0IFNlY3Vy +aXR5IFJlc2VhcmNoIEdyb3VwMSIwIAYDVQQDExkoU1RBR0lORykgUHJldGVuZCBQ +ZWFyIFgxMB4XDTE1MDYwNDExMDQzOFoXDTM1MDYwNDExMDQzOFowZjELMAkGA1UE +BhMCVVMxMzAxBgNVBAoTKihTVEFHSU5HKSBJbnRlcm5ldCBTZWN1cml0eSBSZXNl +YXJjaCBHcm91cDEiMCAGA1UEAxMZKFNUQUdJTkcpIFByZXRlbmQgUGVhciBYMTCC +AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALbagEdDTa1QgGBWSYkyMhsc +ZXENOBaVRTMX1hceJENgsL0Ma49D3MilI4KS38mtkmdF6cPWnL++fgehT0FbRHZg +jOEr8UAN4jH6omjrbTD++VZneTsMVaGamQmDdFl5g1gYaigkkmx8OiCO68a4QXg4 +wSyn6iDipKP8utsE+x1E28SA75HOYqpdrk4HGxuULvlr03wZGTIf/oRt2/c+dYmD +oaJhge+GOrLAEQByO7+8+vzOwpNAPEx6LW+crEEZ7eBXih6VP19sTGy3yfqK5tPt +TdXXCOQMKAp+gCj/VByhmIr+0iNDC540gtvV303WpcbwnkkLYC0Ft2cYUyHtkstO +fRcRO+K2cZozoSwVPyB8/J9RpcRK3jgnX9lujfwA/pAbP0J2UPQFxmWFRQnFjaq6 +rkqbNEBgLy+kFL1NEsRbvFbKrRi5bYy2lNms2NJPZvdNQbT/2dBZKmJqxHkxCuOQ +FjhJQNeO+Njm1Z1iATS/3rts2yZlqXKsxQUzN6vNbD8KnXRMEeOXUYvbV4lqfCf8 +mS14WEbSiMy87GB5S9ucSV1XUrlTG5UGcMSZOBcEUpisRPEmQWUOTWIoDQ5FOia/ +GI+Ki523r2ruEmbmG37EBSBXdxIdndqrjy+QVAmCebyDx9eVEGOIpn26bW5LKeru +mJxa/CFBaKi4bRvmdJRLAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMB +Af8EBTADAQH/MB0GA1UdDgQWBBS182Xy/rAKkh/7PH3zRKCsYyXDFDANBgkqhkiG +9w0BAQsFAAOCAgEAncDZNytDbrrVe68UT6py1lfF2h6Tm2p8ro42i87WWyP2LK8Y +nLHC0hvNfWeWmjZQYBQfGC5c7aQRezak+tHLdmrNKHkn5kn+9E9LCjCaEsyIIn2j +qdHlAkepu/C3KnNtVx5tW07e5bvIjJScwkCDbP3akWQixPpRFAsnP+ULx7k0aO1x +qAeaAhQ2rgo1F58hcflgqKTXnpPM02intVfiVVkX5GXpJjK5EoQtLceyGOrkxlM/ +sTPq4UrnypmsqSagWV3HcUlYtDinc+nukFk6eR4XkzXBbwKajl0YjztfrCIHOn5Q +CJL6TERVDbM/aAPly8kJ1sWGLuvvWYzMYgLzDul//rUF10gEMWaXVZV51KpS9DY/ +5CunuvCXmEQJHo7kGcViT7sETn6Jz9KOhvYcXkJ7po6d93A/jy4GKPIPnsKKNEmR +xUuXY4xRdh45tMJnLTUDdC9FIU0flTeO9/vNpVA8OPU1i14vCz+MU8KX1bV3GXm/ +fxlB7VBBjX9v5oUep0o/j68R/iDlCOM4VVfRa8gX6T2FU7fNdatvGro7uQzIvWof +gN9WUwCbEMBy/YhBSrXycKA8crgGg3x1mIsopn88JKwmMBa68oS7EHM9w7C4y71M +7DiA+/9Qdp9RBWJpTS9i/mDnJg1xvo8Xz49mrrgfmcAXTCJqXi24NatI3Oc= +-----END CERTIFICATE----- diff --git a/jenkins/jenkins-lasttest-agent/lets-encrypt-staging-root-certs/letsencrypt-stg-root-x2.crt b/jenkins/jenkins-lasttest-agent/lets-encrypt-staging-root-certs/letsencrypt-stg-root-x2.crt new file mode 100644 index 0000000000000000000000000000000000000000..f627e1d568d6010aaeb5d4af8b620c2cc4cfe493 --- /dev/null +++ b/jenkins/jenkins-lasttest-agent/lets-encrypt-staging-root-certs/letsencrypt-stg-root-x2.crt @@ -0,0 +1,15 @@ +-----BEGIN CERTIFICATE----- +MIICTjCCAdSgAwIBAgIRAIPgc3k5LlLVLtUUvs4K/QcwCgYIKoZIzj0EAwMwaDEL +MAkGA1UEBhMCVVMxMzAxBgNVBAoTKihTVEFHSU5HKSBJbnRlcm5ldCBTZWN1cml0 +eSBSZXNlYXJjaCBHcm91cDEkMCIGA1UEAxMbKFNUQUdJTkcpIEJvZ3VzIEJyb2Nj +b2xpIFgyMB4XDTIwMDkwNDAwMDAwMFoXDTQwMDkxNzE2MDAwMFowaDELMAkGA1UE +BhMCVVMxMzAxBgNVBAoTKihTVEFHSU5HKSBJbnRlcm5ldCBTZWN1cml0eSBSZXNl +YXJjaCBHcm91cDEkMCIGA1UEAxMbKFNUQUdJTkcpIEJvZ3VzIEJyb2Njb2xpIFgy +MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEOvS+w1kCzAxYOJbA06Aw0HFP2tLBLKPo +FQqR9AMskl1nC2975eQqycR+ACvYelA8rfwFXObMHYXJ23XLB+dAjPJVOJ2OcsjT +VqO4dcDWu+rQ2VILdnJRYypnV1MMThVxo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD +VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU3tGjWWQOwZo2o0busBB2766XlWYwCgYI +KoZIzj0EAwMDaAAwZQIwRcp4ZKBsq9XkUuN8wfX+GEbY1N5nmCRc8e80kUkuAefo +uc2j3cICeXo1cOybQ1iWAjEA3Ooawl8eQyR4wrjCofUE8h44p0j7Yl/kBlJZT8+9 +vbtH7QiVzeKCOTQPINyRql6P +-----END CERTIFICATE----- diff --git a/jenkins/jenkins-lasttest-agent/readme.md b/jenkins/jenkins-lasttest-agent/readme.md new file mode 100644 index 0000000000000000000000000000000000000000..40c9e9cbed624066df5777d1cea8b5b044f1be68 --- /dev/null +++ b/jenkins/jenkins-lasttest-agent/readme.md @@ -0,0 +1,7 @@ +# Image bauen + +`docker build -t docker.ozg-sh.de/jenkins-lasttest-agent:v0.42.0-kubectl-staging-ca .` + +# push + +`docker push docker.ozg-sh.de/jenkins-lasttest-agent:v0.42.0-kubectl-staging-ca` \ No newline at end of file diff --git a/kop-common-dependencies/pom.xml b/kop-common-dependencies/pom.xml index d2e4dbacf69109b509910f9bd7a274bd10563640..e5da1e69b94f828479d83d519b7e53cfbd982a29 100644 --- a/kop-common-dependencies/pom.xml +++ b/kop-common-dependencies/pom.xml @@ -63,7 +63,7 @@ <commons-lang3.version>3.12.0</commons-lang3.version> <commons-collections.version>4.4</commons-collections.version> - <java-jwt.version>4.2.1</java-jwt.version> + <java-jwt.version>4.4.0</java-jwt.version> <jjwt.version>0.11.5</jjwt.version> <!--TODO update - welche version verwendet ops --> diff --git a/kop-common-parent/pom.xml b/kop-common-parent/pom.xml index 78761f24f539bfcf4a3e8587a30558e25015834d..9beabf537e0ebde45a104a7db73b7361ab98ab20 100644 --- a/kop-common-parent/pom.xml +++ b/kop-common-parent/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>3.0.5</version> + <version>3.0.6</version> <relativePath /> </parent> @@ -50,19 +50,21 @@ <kop-common.version>2.0.0</kop-common.version> <kop.license.version>1.6.0</kop.license.version> - - <spring-boot.version>3.0.5</spring-boot.version> - + <mapstruct.version>1.5.3.Final</mapstruct.version> + <spring-boot.version>3.0.6</spring-boot.version> <!-- plugins --> - <maven-surefire-plugin.version>3.0.0-M9</maven-surefire-plugin.version> - <maven-failsafe-plugin.version>3.0.0-M9</maven-failsafe-plugin.version> - <jacoco.plugin.version>0.8.8</jacoco.plugin.version> + <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version> + <maven-failsafe-plugin.version>3.0.0</maven-failsafe-plugin.version> + <jacoco.plugin.version>0.8.10</jacoco.plugin.version> <sonarqube.version>3.9.1.2184</sonarqube.version> <license.plugin.version>4.1</license.plugin.version> <rewrite.plugin.version>4.38.2</rewrite.plugin.version> + + <!--overriden to fix security issue CVE-2022-1471 --> + <snakeyaml.version>2.0</snakeyaml.version> </properties> <dependencyManagement>