From 46acfee268f3dccb932f8115dc889e6a00b8a0dd Mon Sep 17 00:00:00 2001 From: "Vazquez,Brais (IT EDP)" Date: Wed, 4 Sep 2024 09:43:23 +0200 Subject: [PATCH 1/5] Update gitleaks version --- be-fe-mono-repo-plain/files/.pre-commit-config.yaml | 2 +- be-gateway-nginx/files/.pre-commit-config.yaml | 2 +- be-golang-plain/files/.pre-commit-config.yaml | 2 +- be-java-springboot/files/.pre-commit-config.yaml | 2 +- be-python-flask/files/.pre-commit-config.yaml | 2 +- be-rust-axum/rust-template/.pre-commit-config.yaml | 2 +- be-scala-play/files/.pre-commit-config.yaml | 2 +- be-typescript-express/files/.pre-commit-config.yaml | 2 +- docker-plain/files/.pre-commit-config.yaml | 2 +- ds-jupyter-lab/files/.pre-commit-config.yaml | 2 +- ds-rshiny/files/.pre-commit-config.yaml | 2 +- ds-streamlit/files/.pre-commit-config.yaml | 2 +- e2e-cypress/files/.pre-commit-config.yaml | 2 +- e2e-spock-geb/files/.pre-commit-config.yaml | 2 +- fe-angular/files/.pre-commit-config.yaml | 2 +- fe-ionic/files/.pre-commit-config.yaml | 2 +- inf-terraform-aws/files/.pre-commit-config.yaml | 2 +- inf-terraform-azure/files/.pre-commit-config.yaml | 2 +- release-manager/files/.pre-commit-config.yaml | 2 +- saas-documentation/files/.pre-commit-config.yaml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/be-fe-mono-repo-plain/files/.pre-commit-config.yaml b/be-fe-mono-repo-plain/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/be-fe-mono-repo-plain/files/.pre-commit-config.yaml +++ b/be-fe-mono-repo-plain/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/be-gateway-nginx/files/.pre-commit-config.yaml b/be-gateway-nginx/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/be-gateway-nginx/files/.pre-commit-config.yaml +++ b/be-gateway-nginx/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/be-golang-plain/files/.pre-commit-config.yaml b/be-golang-plain/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/be-golang-plain/files/.pre-commit-config.yaml +++ b/be-golang-plain/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/be-java-springboot/files/.pre-commit-config.yaml b/be-java-springboot/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/be-java-springboot/files/.pre-commit-config.yaml +++ b/be-java-springboot/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/be-python-flask/files/.pre-commit-config.yaml b/be-python-flask/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/be-python-flask/files/.pre-commit-config.yaml +++ b/be-python-flask/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/be-rust-axum/rust-template/.pre-commit-config.yaml b/be-rust-axum/rust-template/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/be-rust-axum/rust-template/.pre-commit-config.yaml +++ b/be-rust-axum/rust-template/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/be-scala-play/files/.pre-commit-config.yaml b/be-scala-play/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/be-scala-play/files/.pre-commit-config.yaml +++ b/be-scala-play/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/be-typescript-express/files/.pre-commit-config.yaml b/be-typescript-express/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/be-typescript-express/files/.pre-commit-config.yaml +++ b/be-typescript-express/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/docker-plain/files/.pre-commit-config.yaml b/docker-plain/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/docker-plain/files/.pre-commit-config.yaml +++ b/docker-plain/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/ds-jupyter-lab/files/.pre-commit-config.yaml b/ds-jupyter-lab/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/ds-jupyter-lab/files/.pre-commit-config.yaml +++ b/ds-jupyter-lab/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/ds-rshiny/files/.pre-commit-config.yaml b/ds-rshiny/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/ds-rshiny/files/.pre-commit-config.yaml +++ b/ds-rshiny/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/ds-streamlit/files/.pre-commit-config.yaml b/ds-streamlit/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/ds-streamlit/files/.pre-commit-config.yaml +++ b/ds-streamlit/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/e2e-cypress/files/.pre-commit-config.yaml b/e2e-cypress/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/e2e-cypress/files/.pre-commit-config.yaml +++ b/e2e-cypress/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/e2e-spock-geb/files/.pre-commit-config.yaml b/e2e-spock-geb/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/e2e-spock-geb/files/.pre-commit-config.yaml +++ b/e2e-spock-geb/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/fe-angular/files/.pre-commit-config.yaml b/fe-angular/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/fe-angular/files/.pre-commit-config.yaml +++ b/fe-angular/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/fe-ionic/files/.pre-commit-config.yaml b/fe-ionic/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/fe-ionic/files/.pre-commit-config.yaml +++ b/fe-ionic/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/inf-terraform-aws/files/.pre-commit-config.yaml b/inf-terraform-aws/files/.pre-commit-config.yaml index 921ce09aa..9acbcd4e9 100644 --- a/inf-terraform-aws/files/.pre-commit-config.yaml +++ b/inf-terraform-aws/files/.pre-commit-config.yaml @@ -3,7 +3,7 @@ fail_fast: true repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks - repo: https://github.com/pre-commit/pre-commit-hooks.git diff --git a/inf-terraform-azure/files/.pre-commit-config.yaml b/inf-terraform-azure/files/.pre-commit-config.yaml index 248faf615..108f29478 100644 --- a/inf-terraform-azure/files/.pre-commit-config.yaml +++ b/inf-terraform-azure/files/.pre-commit-config.yaml @@ -2,7 +2,7 @@ exclude: .terraform fail_fast: true repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks - repo: https://github.com/pre-commit/pre-commit-hooks.git diff --git a/release-manager/files/.pre-commit-config.yaml b/release-manager/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/release-manager/files/.pre-commit-config.yaml +++ b/release-manager/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks diff --git a/saas-documentation/files/.pre-commit-config.yaml b/saas-documentation/files/.pre-commit-config.yaml index c9528f476..f1f8f73f5 100644 --- a/saas-documentation/files/.pre-commit-config.yaml +++ b/saas-documentation/files/.pre-commit-config.yaml @@ -1,5 +1,5 @@ repos: - repo: https://github.com/gitleaks/gitleaks - rev: v8.16.1 + rev: v8.18.4 hooks: - id: gitleaks From 52615c1568e95eef2fe164b4f1cb36dd021eff21 Mon Sep 17 00:00:00 2001 From: "Vazquez,Brais (IT EDP) BI-ES-S" Date: Tue, 10 Sep 2024 14:29:48 +0200 Subject: [PATCH 2/5] install java 17 devel --- common/jenkins-agents/jdk/docker/Dockerfile.ubi8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/jenkins-agents/jdk/docker/Dockerfile.ubi8 b/common/jenkins-agents/jdk/docker/Dockerfile.ubi8 index 47579a0f9..87e20335f 100644 --- a/common/jenkins-agents/jdk/docker/Dockerfile.ubi8 +++ b/common/jenkins-agents/jdk/docker/Dockerfile.ubi8 @@ -24,9 +24,9 @@ ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -Dsun.zip.disableMemoryM # COPY certs/* /etc/pki/ca-trust/source/anchors/ # RUN update-ca-trust force-enable && update-ca-trust extract -# Install Java 11, 21 and binutils (Java 17 comes from base agent) +# Install Java devel 11, 17 21 and binutils # Note: use java scripts are executed to test the scripts but also use-j11.sh in called 3nd place to set is as default version -RUN yum install -y java-11-openjdk-devel java-21-openjdk-devel binutils && \ +RUN yum install -y java-11-openjdk-devel java-17-openjdk-devel java-21-openjdk-devel binutils && \ yum clean all -y && \ rm -rf /var/cache/yum From aff7dc33c64da7c2bcc63cddc6b27536d7d00550 Mon Sep 17 00:00:00 2001 From: "Vazquez,Brais (IT EDP)" Date: Tue, 10 Sep 2024 15:14:30 +0200 Subject: [PATCH 3/5] install java 17 devel --- common/jenkins-agents/scala/docker/Dockerfile.ubi8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/jenkins-agents/scala/docker/Dockerfile.ubi8 b/common/jenkins-agents/scala/docker/Dockerfile.ubi8 index 525a570c6..c6b15663d 100644 --- a/common/jenkins-agents/scala/docker/Dockerfile.ubi8 +++ b/common/jenkins-agents/scala/docker/Dockerfile.ubi8 @@ -9,13 +9,13 @@ ARG nexusPassword # Container support is now integrated in Java 11, the +UseCGroupMemoryLimitForHeap option has been pruned ENV JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions -Dsun.zip.disableMemoryMapping=true" -# Install sbt and java 11 (for retrocompatibility) +# Install sbt and java devel 11/17 ENV SBT_VERSION=1.8.2 ENV SBT_CREDENTIALS="$HOME/.sbt/.credentials" RUN rm -f /etc/yum.repos.d/bintray-rpm.repo && \ curl -L https://www.scala-sbt.org/sbt-rpm.repo > sbt-rpm.repo && \ mv sbt-rpm.repo /etc/yum.repos.d/ && \ - yum -y install sbt-$SBT_VERSION java-11-openjdk-devel && \ + yum -y install sbt-$SBT_VERSION java-11-openjdk-devel java-17-openjdk-devel && \ yum clean all && \ rm -rf /var/cache/yum From 678319b8f96a8af701efe52fe9ade18d282d2949 Mon Sep 17 00:00:00 2001 From: "Vazquez,Brais (IT EDP)" Date: Tue, 10 Sep 2024 15:14:37 +0200 Subject: [PATCH 4/5] update docs --- docs/modules/jenkins-agents/pages/jdk.adoc | 1 + docs/modules/jenkins-agents/pages/scala.adoc | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/modules/jenkins-agents/pages/jdk.adoc b/docs/modules/jenkins-agents/pages/jdk.adoc index ee5ae33c5..b21462cba 100644 --- a/docs/modules/jenkins-agents/pages/jdk.adoc +++ b/docs/modules/jenkins-agents/pages/jdk.adoc @@ -27,6 +27,7 @@ NOTE: like this example, you will need to switch back to `java 17` after running Dockerfile.ubi8 installs: - java-21-openjdk-devel +- java-17-openjdk-devel - java-11-openjdk-devel == Known limitations diff --git a/docs/modules/jenkins-agents/pages/scala.adoc b/docs/modules/jenkins-agents/pages/scala.adoc index 9afae8052..58c864181 100644 --- a/docs/modules/jenkins-agents/pages/scala.adoc +++ b/docs/modules/jenkins-agents/pages/scala.adoc @@ -27,6 +27,7 @@ NOTE: like this example, you will need to switch back to `java 17` after running == Installed packages Dockerfile.ubi8 installs: +- java-17-openjdk-devel - java-11-openjdk-devel == Known limitations From b76b615b5afa97f761967429703049cca748a748 Mon Sep 17 00:00:00 2001 From: "Vazquez,Brais (IT EDP)" Date: Tue, 10 Sep 2024 15:16:25 +0200 Subject: [PATCH 5/5] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8d4b2001..55e9ffc67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased - Update OS packages by default and bump gitleaks version ([#1049](https://github.com/opendevstack/ods-quickstarters/issues/1049)) +- Install java 17 devel only in scala and jdk agents ([#1057](https://github.com/opendevstack/ods-quickstarters/pull/1057)) - Update Angular, Ionic and Typescript Quickstarters ([#1033](https://github.com/opendevstack/ods-quickstarters/issues/1033)) - Update Rust Axum Quickstarter to Rust 1.79.0 ([#1024](https://github.com/opendevstack/ods-quickstarters/pull/1024)) - Update jdk and scala quickstarters and agents ([#1032](https://github.com/opendevstack/ods-quickstarters/issues/1032))