From 801bdcb4925fb9bc52dd11834981eff6e16558bb Mon Sep 17 00:00:00 2001 From: Aurelio Garcia-Ribeyro Date: Tue, 15 Oct 2024 22:12:11 -0700 Subject: [PATCH] cleaned trailing whitespaces Signed-off-by: Aurelio Garcia-Ribeyro --- OracleJava/8/serverjre/Dockerfile | 6 +++--- OracleOpenJDK/23/Dockerfile | 14 +++++++------- OracleOpenJDK/23/build.sh | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/OracleJava/8/serverjre/Dockerfile b/OracleJava/8/serverjre/Dockerfile index 1d1a5c759..a85774ce4 100644 --- a/OracleJava/8/serverjre/Dockerfile +++ b/OracleJava/8/serverjre/Dockerfile @@ -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. # @@ -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 @@ -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; diff --git a/OracleOpenJDK/23/Dockerfile b/OracleOpenJDK/23/Dockerfile index d758cbd5c..a2b31472d 100644 --- a/OracleOpenJDK/23/Dockerfile +++ b/OracleOpenJDK/23/Dockerfile @@ -21,7 +21,7 @@ # $ bash build.sh # -FROM oraclelinux:9 +FROM oraclelinux:9 LABEL maintainer="Aurelio Garcia-Ribeyro " @@ -29,18 +29,18 @@ ENV JAVA_URL=https://download.java.net/java/GA/jdk23.0.1/c28985cbf10d4e648e40040 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; \ @@ -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"; \ @@ -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"] \ No newline at end of file diff --git a/OracleOpenJDK/23/build.sh b/OracleOpenJDK/23/build.sh index e3b159cb3..7c6e711e3 100755 --- a/OracleOpenJDK/23/build.sh +++ b/OracleOpenJDK/23/build.sh @@ -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.