Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install java 17 devel in jdk and scala agents #1057

Merged
merged 6 commits into from
Sep 12, 2024
Merged

Install java 17 devel in jdk and scala agents #1057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
46acfee
Update gitleaks version
BraisVQ Sep 4, 2024
d89e21b
Merge branch 'master' of https://github.com/opendevstack/ods-quicksta…
BraisVQ Sep 10, 2024
52615c1
install java 17 devel
BraisVQ Sep 10, 2024
aff7dc3
install java 17 devel
BraisVQ Sep 10, 2024
678319b
update docs
BraisVQ Sep 10, 2024
b76b615
changelog
BraisVQ Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions common/jenkins-agents/jdk/docker/Dockerfile.ubi8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions common/jenkins-agents/scala/docker/Dockerfile.ubi8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions docs/modules/jenkins-agents/pages/jdk.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docs/modules/jenkins-agents/pages/scala.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down