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

Jump to bottom

Use Alma Linux 9 instead of Alma Linux 8 #1629

Closed
wants to merge 7 commits into from
Closed

Use Alma Linux 9 instead of Alma Linux 8 #1629

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2a40e02
Use Alma Linux 9.2, not 8.7
MarkEWaite May 13, 2023
61c1c65
Merge branch 'master' into use-almalinux-9
MarkEWaite May 14, 2023
ac081bc
Merge branch 'master' into use-almalinux-9
dduportal May 15, 2023
f291ede
Use JDK build for UBI9
MarkEWaite May 17, 2023
9c46129
Merge branch 'master' into use-almalinux-9
MarkEWaite May 17, 2023
fbdc485
Merge branch 'master' into use-almalinux-9
dduportal May 17, 2023
d8017cd
Merge branch 'master' into use-almalinux-9
MarkEWaite May 23, 2023
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
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
* @jenkinsci/team-docker-packaging
*/rhel/ubi*/ @olivergondza
*/almalinux/almalinux8/ @saper
*/almalinux/almalinux9/ @saper
2 changes: 1 addition & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ updates:
# AlmaLinux

- package-ecosystem: docker
directory: "11/almalinux/almalinux8/hotspot"
directory: "11/almalinux/almalinux9/hotspot"
schedule:
interval: weekly
open-pull-requests-limit: 2
Expand Down
6 changes: 3 additions & 3 deletions 11/almalinux/almalinux8/hotspot/Dockerfile → 11/almalinux/almalinux9/hotspot/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN jlink \
--compress=2 \
--output /javaruntime

FROM almalinux:8.7
FROM almalinux:9.2-20230512

ENV LANG C.UTF-8

Expand Down Expand Up @@ -66,10 +66,10 @@ RUN curl -fsSL "https://github.com/krallin/tini/releases/download/${TINI_VERSION

# jenkins version being bundled in this docker image
ARG JENKINS_VERSION
ENV JENKINS_VERSION ${JENKINS_VERSION:-2.356}
ENV JENKINS_VERSION ${JENKINS_VERSION:-2.401}

# jenkins.war checksum, download will be validated using it
ARG JENKINS_SHA=1163c4554dc93439c5eef02b06a8d74f98ca920bbc012c2b8a089d414cfa8075
ARG JENKINS_SHA=9f80ea9080c036a4bb7bd0d70a8863e13bdeea04bf7d6320d509bdcf888172b1

# Can be used to customize where jenkins.war get downloaded from
ARG JENKINS_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war
Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ function "tag_lts" {
# ---- targets ----

target "almalinux_jdk11" {
dockerfile = "11/almalinux/almalinux8/hotspot/Dockerfile"
dockerfile = "11/almalinux/almalinux9/hotspot/Dockerfile"
context = "."
args = {
JENKINS_VERSION = JENKINS_VERSION
Expand Down