Skip to content

Commit d966621

Browse files
aureliogrbDjelibeybi
aureliogrb
authored and
Djelibeybi
committed
removed trailing spaces and replaced OL with Oracle Linux in the comments
Signed-off-by: Aurelio Garcia-Ribeyro <aurelio.garciaribeyro@oracle.com>
1 parent 6156518 commit d966621

File tree

11 files changed

+66
-67
lines changed

11 files changed

+66
-67
lines changed

‎OracleJava/11/Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ FROM oraclelinux:7-slim as builder
2828
LABEL maintainer="Aurelio Garcia-Ribeyro <aurelio.garciaribeyro@oracle.com>"
2929

3030
RUN yum install -y gzip tar
31-
32-
31+
32+
3333
# Default to UTF-8 file.encoding
3434
ENV LANG en_US.UTF-8
3535

@@ -50,21 +50,21 @@ RUN set -eux; \
5050
JAVA_SHA256=d22d0fcca761861a1eb2f5f6eb116c933354e8b1f76b3cda189c722cc0177c98 ; \
5151
else \
5252
mv "$(ls /tmp/jdk-11*_linux-aarch64_bin.tar.gz)" /tmp/jdk.tar.gz ; \
53-
JAVA_SHA256=3fc0d93f6363d32723c293ba5a9016e8ab27410351ed804020cfe71e87d3bc0a ; \
53+
JAVA_SHA256=3fc0d93f6363d32723c293ba5a9016e8ab27410351ed804020cfe71e87d3bc0a ; \
5454
fi && \
5555
echo "$JAVA_SHA256 */tmp/jdk.tar.gz" | sha256sum -c -; \
5656
mkdir -p "$JAVA_HOME"; \
5757
tar --extract --file /tmp/jdk.tar.gz --directory "$JAVA_HOME" --strip-components 1
58-
59-
## Get a fresh version of SLIM for the final image
58+
59+
## Get a fresh version of Oracle Linux 7-slim for the final image
6060
FROM oraclelinux:7-slim
6161

6262
# Default to UTF-8 file.encoding
6363
ENV LANG en_US.UTF-8
6464

6565
ENV JAVA_HOME=/usr/java/jdk-11
6666

67-
ENV PATH $JAVA_HOME/bin:$PATH
67+
ENV PATH $JAVA_HOME/bin:$PATH
6868

6969
# Copy the uncompressed Java Runtime from the builder image
7070
COPY --from=builder $JAVA_HOME $JAVA_HOME
@@ -73,7 +73,7 @@ RUN set -eux; \
7373
# Update the base image
7474
yum -y update; \
7575
yum install -y \
76-
# JDK assumes freetype is available
76+
# JDK assumes freetype is available
7777
freetype fontconfig \
7878
; \
7979
rm -rf /var/cache/yum; \
@@ -84,7 +84,7 @@ RUN set -eux; \
8484
[ ! -e "/usr/bin/$base" ]; \
8585
alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \
8686
done; \
87-
# -Xshare:dump will create a CDS archive to improve startup in subsequent runs
88-
java -Xshare:dump;
87+
# -Xshare:dump will create a CDS archive to improve startup in subsequent runs
88+
java -Xshare:dump;
8989

9090
CMD ["jshell"]

‎OracleJava/11/Dockerfile.ol8‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ RUN set -eux; \
5555
mkdir -p "$JAVA_HOME"; \
5656
tar --extract --file /tmp/jdk.tar.gz --directory "$JAVA_HOME" --strip-components 1
5757

58-
## Get a fresh version of OL8 for the final image
58+
## Get a fresh version of Oracle Linux 8 for the final image
5959
FROM oraclelinux:8
6060

6161
# Default to UTF-8 file.encoding

‎OracleJava/17/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ RUN set -eux; \
5353
echo "$JAVA_SHA256 */tmp/jdk.tar.gz" | sha256sum -c -; \
5454
mkdir -p "$JAVA_HOME"; \
5555
tar --extract --file /tmp/jdk.tar.gz --directory "$JAVA_HOME" --strip-components 1
56-
57-
## Get a fresh version of OL8 for the final image
56+
57+
## Get a fresh version of Oracle Linux 8 for the final image
5858
FROM oraclelinux:8
5959

6060
# Default to UTF-8 file.encoding
6161
ENV LANG en_US.UTF-8
6262
ENV JAVA_HOME=/usr/java/jdk-17
63-
ENV PATH $JAVA_HOME/bin:$PATH
63+
ENV PATH $JAVA_HOME/bin:$PATH
6464

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

6868
# Copy the uncompressed Java Runtime from the builder image
@@ -71,7 +71,7 @@ COPY --from=builder $JAVA_HOME $JAVA_HOME
7171
RUN set -eux; \
7272
# Ensure we get the latest OL 8 updates available at build time
7373
dnf -y update; \
74-
# JDK assumes freetype is available
74+
# JDK assumes freetype is available
7575
dnf install -y \
7676
freetype fontconfig \
7777
; \
@@ -83,5 +83,5 @@ RUN set -eux; \
8383
[ ! -e "/usr/bin/$base" ]; \
8484
alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \
8585
done;
86-
86+
8787
CMD ["jshell"]

‎OracleJava/21/Dockerfile‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
# REQUIRED FILES TO BUILD THIS IMAGE
1010
# ----------------------------------
1111
# This dockerfile will download a copy of JDK 21 from
12-
# https://download.oracle.com/java/21/latest/jdk-21_linux-<ARCH>_bin.tar.gz
13-
#
12+
# https://download.oracle.com/java/21/latest/jdk-21_linux-<ARCH>_bin.tar.gz
13+
#
1414
# It will use either x64 or aarch64 depending on the target platform
1515
#
1616
# HOW TO BUILD THIS IMAGE
@@ -29,14 +29,14 @@ LABEL maintainer="Aurelio Garcia-Ribeyro <aurelio.garciaribeyro@oracle.com>"
2929

3030
# Since the files are compressed as tar.gz first dnf install tar. gzip is already in oraclelinux:8
3131
RUN set -eux; \
32-
dnf install -y tar;
33-
32+
dnf install -y tar;
33+
3434
# Default to UTF-8 file.encoding
3535
ENV LANG en_US.UTF-8
3636

3737
# Environment variables for the builder image.
3838
# Required to validate that you are using the correct file
39-
39+
4040
ENV JAVA_URL=https://download.oracle.com/java/21/latest \
4141
JAVA_HOME=/usr/java/jdk-21
4242

@@ -49,21 +49,21 @@ RUN set -eux; \
4949
then ARCH="x64"; \
5050
fi && \
5151
JAVA_PKG="$JAVA_URL"/jdk-21_linux-"${ARCH}"_bin.tar.gz ; \
52-
JAVA_SHA256=$(curl "$JAVA_PKG".sha256) ; \
52+
JAVA_SHA256=$(curl "$JAVA_PKG".sha256) ; \
5353
curl --output /tmp/jdk.tgz "$JAVA_PKG" && \
5454
echo "$JAVA_SHA256" */tmp/jdk.tgz | sha256sum -c; \
5555
mkdir -p "$JAVA_HOME"; \
5656
tar --extract --file /tmp/jdk.tgz --directory "$JAVA_HOME" --strip-components 1
57-
58-
## Get a fresh version of OL8 for the final image
57+
58+
## Get a fresh version of Oracle Linux 8 for the final image
5959
FROM oraclelinux:8
6060

6161
# Default to UTF-8 file.encoding
6262
ENV LANG en_US.UTF-8
6363
ENV JAVA_HOME=/usr/java/jdk-21
64-
ENV PATH $JAVA_HOME/bin:$PATH
64+
ENV PATH $JAVA_HOME/bin:$PATH
6565

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

6969
# Copy the uncompressed Java Runtime from the builder image
@@ -72,7 +72,7 @@ COPY --from=builder $JAVA_HOME $JAVA_HOME
7272
RUN set -eux; \
7373
# Ensure we get the latest OL 8 updates available at build time
7474
dnf -y update; \
75-
# JDK assumes freetype is available
75+
# JDK assumes freetype is available
7676
dnf install -y \
7777
freetype fontconfig \
7878
; \
@@ -84,5 +84,5 @@ RUN set -eux; \
8484
[ ! -e "/usr/bin/$base" ]; \
8585
alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \
8686
done;
87-
87+
8888
CMD ["jshell"]

‎OracleJava/21/Dockerfile.ol9‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
# REQUIRED FILES TO BUILD THIS IMAGE
1010
# ----------------------------------
1111
# This dockerfile will download a copy of JDK 21 from
12-
# https://download.oracle.com/java/21/latest/jdk-21_linux-<ARCH>_bin.tar.gz
13-
#
12+
# https://download.oracle.com/java/21/latest/jdk-21_linux-<ARCH>_bin.tar.gz
13+
#
1414
# It will use either x64 or aarch64 depending on the target platform
1515
#
1616
# HOW TO BUILD THIS IMAGE
@@ -29,14 +29,14 @@ LABEL maintainer="Aurelio Garcia-Ribeyro <aurelio.garciaribeyro@oracle.com>"
2929

3030
# Since the files are compressed as tar.gz first dnf install tar. gzip is already in oraclelinux:9
3131
RUN set -eux; \
32-
dnf install -y tar;
33-
32+
dnf install -y tar;
33+
3434
# Default to UTF-8 file.encoding
3535
ENV LANG en_US.UTF-8
3636

3737
# Environment variables for the builder image.
3838
# Required to validate that you are using the correct file
39-
39+
4040
ENV JAVA_URL=https://download.oracle.com/java/21/latest \
4141
JAVA_HOME=/usr/java/jdk-21
4242

@@ -49,30 +49,30 @@ RUN set -eux; \
4949
then ARCH="x64"; \
5050
fi && \
5151
JAVA_PKG="$JAVA_URL"/jdk-21_linux-"${ARCH}"_bin.tar.gz ; \
52-
JAVA_SHA256=$(curl "$JAVA_PKG".sha256) ; \
52+
JAVA_SHA256=$(curl "$JAVA_PKG".sha256) ; \
5353
curl --output /tmp/jdk.tgz "$JAVA_PKG" && \
5454
echo "$JAVA_SHA256" */tmp/jdk.tgz | sha256sum -c; \
5555
mkdir -p "$JAVA_HOME"; \
5656
tar --extract --file /tmp/jdk.tgz --directory "$JAVA_HOME" --strip-components 1
57-
58-
## Get a fresh version of OL9 for the final image
57+
58+
## Get a fresh version of Oracle Linux 9 for the final image
5959
FROM oraclelinux:9
6060

6161
# Default to UTF-8 file.encoding
6262
ENV LANG en_US.UTF-8
6363
ENV JAVA_HOME=/usr/java/jdk-21
64-
ENV PATH $JAVA_HOME/bin:$PATH
64+
ENV PATH $JAVA_HOME/bin:$PATH
6565

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

6969
# Copy the uncompressed Java Runtime from the builder image
7070
COPY --from=builder $JAVA_HOME $JAVA_HOME
7171

7272
RUN set -eux; \
73-
# Ensure we get the latest OL 9 updates available at build time
73+
# Ensure we get the latest Oracle Linux 9 updates available at build time
7474
dnf -y update; \
75-
# JDK assumes freetype is available
75+
# JDK assumes freetype is available
7676
dnf install -y \
7777
freetype fontconfig \
7878
; \
@@ -84,5 +84,5 @@ RUN set -eux; \
8484
[ ! -e "/usr/bin/$base" ]; \
8585
alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \
8686
done;
87-
87+
8888
CMD ["jshell"]

‎OracleJava/23/Dockerfile‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
# REQUIRED FILES TO BUILD THIS IMAGE
1010
# ----------------------------------
1111
# This dockerfile will download a copy of JDK 23 from
12-
# https://download.oracle.com/java/23/latest/jdk-23_linux-<ARCH>_bin.tar.gz
13-
#
12+
# https://download.oracle.com/java/23/latest/jdk-23_linux-<ARCH>_bin.tar.gz
13+
#
1414
# It will use either x64 or aarch64 depending on the target platform
1515
#
1616
# HOW TO BUILD THIS IMAGE
@@ -29,14 +29,14 @@ LABEL maintainer="Aurelio Garcia-Ribeyro <aurelio.garciaribeyro@oracle.com>"
2929

3030
# Since the files are compressed as tar.gz first dnf install tar. gzip is already in oraclelinux:9
3131
RUN set -eux; \
32-
dnf install -y tar;
33-
32+
dnf install -y tar;
33+
3434
# Default to UTF-8 file.encoding
3535
ENV LANG en_US.UTF-8
3636

3737
# Environment variables for the builder image.
3838
# Required to validate that you are using the correct file
39-
39+
4040
ENV JAVA_URL=https://download.oracle.com/java/23/latest \
4141
JAVA_HOME=/usr/java/jdk-23
4242

@@ -49,30 +49,30 @@ RUN set -eux; \
4949
then ARCH="x64"; \
5050
fi && \
5151
JAVA_PKG="$JAVA_URL"/jdk-23_linux-"${ARCH}"_bin.tar.gz ; \
52-
JAVA_SHA256=$(curl "$JAVA_PKG".sha256) ; \
52+
JAVA_SHA256=$(curl "$JAVA_PKG".sha256) ; \
5353
curl --output /tmp/jdk.tgz "$JAVA_PKG" && \
5454
echo "$JAVA_SHA256" */tmp/jdk.tgz | sha256sum -c; \
5555
mkdir -p "$JAVA_HOME"; \
5656
tar --extract --file /tmp/jdk.tgz --directory "$JAVA_HOME" --strip-components 1
57-
58-
## Get a fresh version of OL8 for the final image
57+
58+
## Get a fresh version of Oracle Linux 9 for the final image
5959
FROM oraclelinux:9
6060

6161
# Default to UTF-8 file.encoding
6262
ENV LANG en_US.UTF-8
6363
ENV JAVA_HOME=/usr/java/jdk-23
64-
ENV PATH $JAVA_HOME/bin:$PATH
64+
ENV PATH $JAVA_HOME/bin:$PATH
6565

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

6969
# Copy the uncompressed Java Runtime from the builder image
7070
COPY --from=builder $JAVA_HOME $JAVA_HOME
7171

7272
RUN set -eux; \
73-
# Ensure we get the latest OL 8 updates available at build time
73+
# Ensure we get the latest Oracle Linux 8 updates available at build time
7474
dnf -y update; \
75-
# JDK assumes freetype is available
75+
# JDK assumes freetype is available
7676
dnf install -y \
7777
freetype fontconfig \
7878
; \
@@ -84,5 +84,5 @@ RUN set -eux; \
8484
[ ! -e "/usr/bin/$base" ]; \
8585
alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \
8686
done;
87-
87+
8888
CMD ["jshell"]

‎OracleJava/23/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
#
55
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
66

7-
echo "Building Oracle JDK 23 on Oracle Linux 0"
7+
echo "Building Oracle JDK 23 on Oracle Linux 9"
88
docker build --file Dockerfile --tag oracle/jdk:23-ol9 .

‎OracleJava/8/jdk/Dockerfile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2024 Oracle and/or its affiliates.
1+
# Copyright (c) 2024 Oracle and/or its affiliates.
22
#
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
#
@@ -48,20 +48,20 @@ RUN set -eux; \
4848
JAVA_SHA256=b396978a716b7d23ccccabfe5c47c3b75d2434d7f8f7af690bc648172382720d ; \
4949
else \
5050
mv "$(ls /tmp/jdk-8*-linux-aarch64.tar.gz)" /tmp/jdk.tar.gz ; \
51-
JAVA_SHA256=e68d3e31ffcf7f05a4de65d04974843073bdff238bb6524adb272de9e616be7c ; \
51+
JAVA_SHA256=e68d3e31ffcf7f05a4de65d04974843073bdff238bb6524adb272de9e616be7c ; \
5252
fi && \
5353
echo "$JAVA_SHA256 */tmp/jdk.tar.gz" | sha256sum -c -; \
5454
mkdir -p "$JAVA_HOME"; \
5555
tar --extract --file /tmp/jdk.tar.gz --directory "$JAVA_HOME" --strip-components 1
5656

57-
## Get a fresh version of SLIM for the final image
57+
## Get a fresh version of Oracle Linux 7-slim for the final image
5858
FROM oraclelinux:7-slim
5959

6060
# Default to UTF-8 file.encoding
6161
ENV LANG en_US.UTF-8
6262

63-
ENV JAVA_HOME=/usr/java/jdk-8
64-
63+
ENV JAVA_HOME=/usr/java/jdk-8
64+
6565
ENV PATH $JAVA_HOME/bin:$PATH
6666

6767
# Copy the uncompressed Java Runtime from the builder image
@@ -77,8 +77,7 @@ RUN yum -y update; \
7777
[ ! -e "/usr/bin/$base" ]; \
7878
alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \
7979
done; \
80-
# -Xshare:dump will create a CDS archive to improve startup in subsequent runs
81-
# the file will be stored as /usr/java/jdk-8/jre/lib/amd64/server/classes.jsa
80+
# -Xshare:dump will create a CDS archive to improve startup in subsequent runs
81+
# the file will be stored as /usr/java/jdk-8/jre/lib/amd64/server/classes.jsa
8282
# See https://docs.oracle.com/javase/8/docs/technotes/guides/vm/class-data-sharing.html
8383
java -Xshare:dump;
84-

‎OracleJava/8/jdk/Dockerfile.ol8‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ RUN set -eux; \
4848
JAVA_SHA256=b396978a716b7d23ccccabfe5c47c3b75d2434d7f8f7af690bc648172382720d ; \
4949
else \
5050
mv "$(ls /tmp/jdk-8*-linux-aarch64.tar.gz)" /tmp/jdk.tar.gz ; \
51-
JAVA_SHA256=e68d3e31ffcf7f05a4de65d04974843073bdff238bb6524adb272de9e616be7c ; \
51+
JAVA_SHA256=e68d3e31ffcf7f05a4de65d04974843073bdff238bb6524adb272de9e616be7c ; \
5252
fi && \
5353
echo "$JAVA_SHA256 */tmp/jdk.tar.gz" | sha256sum -c -; \
5454
mkdir -p "$JAVA_HOME"; \
5555
tar --extract --file /tmp/jdk.tar.gz --directory "$JAVA_HOME" --strip-components 1
5656

57-
## Get a fresh version of OL 8 for the final image
57+
## Get a fresh version of Oracle Linux 8 for the final image
5858

5959
FROM oraclelinux:8
6060

0 commit comments

Comments
 (0)