Skip to content

Commit

Permalink
cleaned trailing whitespaces
Browse files Browse the repository at this point in the history
Signed-off-by: Aurelio Garcia-Ribeyro <aurelio.garciaribeyro@oracle.com>
  • Loading branch information
aureliogrb authored and Djelibeybi committed Oct 16, 2024
1 parent d966621 commit 801bdcb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions OracleJava/8/serverjre/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2019, 2024 Oracle and/or its affiliates.
# Copyright (c) 2019, 2024 Oracle and/or its affiliates.
#
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
#
Expand Down Expand Up @@ -35,7 +35,7 @@ ENV LANG en_US.UTF-8

# Environment variables for the builder image.
# Required to validate that you are using the correct file

ENV JAVA_HOME=/usr/java/jdk-8

COPY server-jre-8u*-linux-x64.tar.gz /tmp/jdk.tgz
Expand Down Expand Up @@ -71,6 +71,6 @@ RUN yum -y update; \
alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \
done; \
# -Xshare:dump will create a CDS archive to improve startup in subsequent runs
# the file will be stored as /usr/java/jdk-8/jre/lib/amd64/server/classes.jsa
# the file will be stored as /usr/java/jdk-8/jre/lib/amd64/server/classes.jsa
# See https://docs.oracle.com/javase/8/docs/technotes/guides/vm/class-data-sharing.html
java -Xshare:dump;
14 changes: 7 additions & 7 deletions OracleOpenJDK/23/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,26 @@
# $ bash build.sh
#

FROM oraclelinux:9
FROM oraclelinux:9

LABEL maintainer="Aurelio Garcia-Ribeyro <aurelio.garciaribeyro@oracle.com>"

ENV JAVA_URL=https://download.java.net/java/GA/jdk23.0.1/c28985cbf10d4e648e4004050f8781aa/11/GPL \
JAVA_HOME=/usr/java/jdk-23 \
LANG=en_US.UTF-8

# If you need the Java Version you can read it from the release file with
# If you need the Java Version you can read it from the release file with
#JAVA_VERSION=$(sed -n '/^JAVA_VERSION="/{s///;s/"//;p;}' "$JAVA_HOME"/release);

ENV PATH $JAVA_HOME/bin:$PATH

# Since the files are compressed as tar.gz first dnf install tar. gzip is already in oraclelinux:9
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
RUN set -eux; \
dnf -y update; \
dnf install -y \
tar \
# JDK assumes freetype is available
# JDK assumes freetype is available
freetype fontconfig \
; \
rm -rf /var/cache/dnf; \
Expand All @@ -50,7 +50,7 @@ RUN set -eux; \
then ARCH="x64"; \
fi && \
JAVA_PKG="$JAVA_URL"/openjdk-23.0.1_linux-"${ARCH}"_bin.tar.gz ; \
JAVA_SHA256="$(curl "$JAVA_PKG".sha256)" ; \
JAVA_SHA256="$(curl "$JAVA_PKG".sha256)" ; \
curl --output /tmp/jdk.tgz "$JAVA_PKG" && \
echo "$JAVA_SHA256" */tmp/jdk.tgz | sha256sum -c -; \
mkdir -p "$JAVA_HOME"; \
Expand All @@ -63,6 +63,6 @@ RUN ln -sfT "$JAVA_HOME" /usr/java/default; \
base="$(basename "$bin")"; \
[ ! -e "/usr/bin/$base" ]; \
alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \
done;
done;

CMD ["jshell"]
2 changes: 1 addition & 1 deletion OracleOpenJDK/23/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

# Copyright (c) 2023 Oracle and/or its affiliates.
# Copyright (c) 2023 Oracle and/or its affiliates.
#
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.

Expand Down

0 comments on commit 801bdcb

Please sign in to comment.