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

Add oraclelinux9 variants #535

Merged
merged 1 commit into from
Mar 15, 2024
Merged

Add oraclelinux9 variants #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions 22/jdk/oraclelinux7/Dockerfile → 22/jdk/oraclelinux9/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions 23/jdk/oraclelinux7/Dockerfile → 23/jdk/oraclelinux9/Dockerfile
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 1 addition & 10 deletions Dockerfile-linux.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,7 @@ ENV JAVA_HOME /opt/openjdk-{{ env.version }}
FROM oraclelinux:{{ oracle_version }}-slim

RUN set -eux; \
{{ if oracle_version == "7" then ( -}}
# https://unix.stackexchange.com/a/477127/153467
yum install -y --setopt=skip_missing_names_on_install=False \
{{ ) else ( -}}
microdnf install \
{{ ) end -}}
gzip \
tar \
\
Expand All @@ -52,11 +47,7 @@ RUN set -eux; \
# https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077
freetype fontconfig \
; \
{{ if oracle_version == "7" then ( -}}
rm -rf /var/cache/yum
{{ ) else ( -}}
microdnf clean all
{{ ) end -}}

ENV JAVA_HOME /usr/java/openjdk-{{ env.version }}
{{
Expand Down Expand Up @@ -107,7 +98,7 @@ ENV PATH $JAVA_HOME/bin:$PATH

{{ if is_alpine then "" else ( -}}
# Default to UTF-8 file.encoding
ENV LANG {{ if is_oracle and oracle_version == "7" then "en_US.UTF-8" else "C.UTF-8" end }}
ENV LANG C.UTF-8

{{ ) end -}}
{{ def java_version: if is_alpine then .alpine.version else .version end -}}
Expand Down
4 changes: 2 additions & 2 deletions versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
}
},
"variants": [
"oraclelinux9",
"oraclelinux8",
"oraclelinux7",
"bookworm",
"slim-bookworm",
"bullseye",
Expand Down Expand Up @@ -47,8 +47,8 @@
}
},
"variants": [
"oraclelinux9",
"oraclelinux8",
"oraclelinux7",
"bookworm",
"slim-bookworm",
"bullseye",
Expand Down
4 changes: 2 additions & 2 deletions versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ for version in "${versions[@]}"; do
.[env.version] = $doc + {
variants: [
(
"9",
"8",
"7",
empty
| "oraclelinux" + .),
(
Expand All @@ -160,8 +160,8 @@ for version in "${versions[@]}"; do
empty
| ., "slim-" + .),
if $doc.alpine then
"3.19",
"3.18",
"3.17",
empty
| "alpine" + . else empty end,
if $doc.jdk.arches | keys | any(startswith("windows-")) then
Expand Down
Loading