From 83f5452b46c8e5c5ac6a7fb9a1e9b1e90dc2bd0a Mon Sep 17 00:00:00 2001 From: Marcos Caputo Date: Sat, 19 Oct 2024 09:10:22 -0300 Subject: [PATCH 1/2] Update Oracle WebLogic and Java Dockerfiles for version 14.1.1.0 - Standardized Dockerfile formatting (e.g., uppercase `AS` in multi-stage builds) - Fixed minor grammatical issues in comments for clarity - Improved environment variable definitions with consistent syntax - Refined system update commands and alternatives configuration for Java binaries - Removed deprecated Dockerfiles for developer, generic, and slim distributions - Updated buildDockerImage.sh script for better compatibility with JDK 8/11 This update ensures consistency across the Dockerfiles and improves build stability. Signed-off-by: Marcos Caputo --- OracleJava/8/jdk/Dockerfile | 41 ++++--- OracleJava/8/jdk/Dockerfile.ol8 | 51 ++++---- OracleJava/8/serverjre/Dockerfile | 21 ++-- OracleJava/8/serverjre/Dockerfile.ol8 | 26 ++--- ...file.developer-11 => Dockerfile.developer} | 24 ++-- .../14.1.1.0/Dockerfile.developer-8 | 108 ----------------- ...ckerfile.generic-11 => Dockerfile.generic} | 75 +++++------- .../dockerfiles/14.1.1.0/Dockerfile.generic-8 | 108 ----------------- .../{Dockerfile.slim-11 => Dockerfile.slim} | 23 ++-- .../dockerfiles/14.1.1.0/Dockerfile.slim-8 | 110 ------------------ .../dockerfiles/buildDockerImage.sh | 27 ++--- 11 files changed, 135 insertions(+), 479 deletions(-) rename OracleWebLogic/dockerfiles/14.1.1.0/{Dockerfile.developer-11 => Dockerfile.developer} (90%) delete mode 100755 OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.developer-8 rename OracleWebLogic/dockerfiles/14.1.1.0/{Dockerfile.generic-11 => Dockerfile.generic} (58%) delete mode 100755 OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.generic-8 rename OracleWebLogic/dockerfiles/14.1.1.0/{Dockerfile.slim-11 => Dockerfile.slim} (90%) delete mode 100755 OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.slim-8 diff --git a/OracleJava/8/jdk/Dockerfile b/OracleJava/8/jdk/Dockerfile index 775468de32..2afc5c1aaf 100644 --- a/OracleJava/8/jdk/Dockerfile +++ b/OracleJava/8/jdk/Dockerfile @@ -19,65 +19,64 @@ # $ docker build -t oracle/jdk:8 . # # This command is already scripted in build.sh so you can alternatively run -# $ bash build.sh +# $ bash build.sh # # The builder image will be used to uncompress the tar.gz file with the Java Runtime. -FROM oraclelinux:7-slim as builder +FROM oraclelinux:7-slim AS builder LABEL maintainer="Aurelio Garcia-Ribeyro " -# Since the files is compressed as tar.gz first yum install gzip and tar +# Since the file is compressed as tar.gz, first install gzip and tar RUN yum install -y gzip tar # Default to UTF-8 file.encoding -ENV LANG en_US.UTF-8 +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 the JDK tar.gz file COPY jdk-8u*.tar.gz /tmp/ SHELL ["/bin/bash", "-o", "pipefail", "-c"] + RUN set -eux; \ - ARCH="$(uname -m)" && \ - if [ "$ARCH" = "x86_64" ]; \ - then \ - mv "$(ls /tmp/jdk-8*-linux-x64.tar.gz)" /tmp/jdk.tar.gz ; \ - JAVA_SHA256=b396978a716b7d23ccccabfe5c47c3b75d2434d7f8f7af690bc648172382720d ; \ + ARCH="$(uname -m)"; \ + if [ "$ARCH" = "x86_64" ]; then \ + mv "$(ls /tmp/jdk-8*-linux-x64.tar.gz)" /tmp/jdk.tar.gz; \ + JAVA_SHA256=b396978a716b7d23ccccabfe5c47c3b75d2434d7f8f7af690bc648172382720d; \ else \ - mv "$(ls /tmp/jdk-8*-linux-aarch64.tar.gz)" /tmp/jdk.tar.gz ; \ - JAVA_SHA256=e68d3e31ffcf7f05a4de65d04974843073bdff238bb6524adb272de9e616be7c ; \ - fi && \ + mv "$(ls /tmp/jdk-8*-linux-aarch64.tar.gz)" /tmp/jdk.tar.gz; \ + JAVA_SHA256=e68d3e31ffcf7f05a4de65d04974843073bdff238bb6524adb272de9e616be7c; \ + fi; \ echo "$JAVA_SHA256 */tmp/jdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ - tar --extract --file /tmp/jdk.tar.gz --directory "$JAVA_HOME" --strip-components 1 + tar --extract --file /tmp/jdk.tar.gz --directory "$JAVA_HOME" --strip-components 1; ## Get a fresh version of Oracle Linux 7-slim for the final image FROM oraclelinux:7-slim # Default to UTF-8 file.encoding -ENV LANG en_US.UTF-8 +ENV LANG=en_US.UTF-8 +# Set environment variables for Java ENV JAVA_HOME=/usr/java/jdk-8 - -ENV PATH $JAVA_HOME/bin:$PATH +ENV PATH=$JAVA_HOME/bin:$PATH # Copy the uncompressed Java Runtime from the builder image COPY --from=builder $JAVA_HOME $JAVA_HOME -## +# Perform system updates and set up Java alternatives RUN yum -y update; \ rm -rf /var/cache/yum; \ ln -sfT "$JAVA_HOME" /usr/java/default; \ ln -sfT "$JAVA_HOME" /usr/java/latest; \ for bin in "$JAVA_HOME/bin/"*; do \ base="$(basename "$bin")"; \ - [ ! -e "/usr/bin/$base" ]; \ - alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \ + [ ! -e "/usr/bin/$base" ] && 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/OracleJava/8/jdk/Dockerfile.ol8 b/OracleJava/8/jdk/Dockerfile.ol8 index cb7857ee77..d416ab1c77 100644 --- a/OracleJava/8/jdk/Dockerfile.ol8 +++ b/OracleJava/8/jdk/Dockerfile.ol8 @@ -18,67 +18,64 @@ # Run: # $ docker build -t oracle/jdk:8 . # -# This command is already scripted in build.sh so you can alternatively run -# $ bash build.sh 8 +# This command is already scripted in build.sh so you can alternatively run: +# $ bash build.sh 8 # # The builder image will be used to uncompress the tar.gz file with the Java Runtime. -FROM oraclelinux:8 as builder +FROM oraclelinux:8 AS builder LABEL maintainer="Aurelio Garcia-Ribeyro " -# Since the files is compressed as tar.gz first yum install tar. gzip is already in oraclelinux:8 +# Since the file is compressed as tar.gz, install tar (gzip is already included in oraclelinux:8) RUN dnf install -y tar -# Default to UTF-8 file.encoding -ENV LANG en_US.UTF-8 - -# Environment variables for the builder image. -# Required to validate that you are using the correct file +# Default to UTF-8 file encoding +ENV LANG=en_US.UTF-8 +# Set environment variables for the builder image ENV JAVA_HOME=/usr/java/jdk-8 +# Copy the JDK tar.gz file COPY jdk-8u*.tar.gz /tmp/ SHELL ["/bin/bash", "-o", "pipefail", "-c"] + RUN set -eux; \ - ARCH="$(uname -m)" && \ - if [ "$ARCH" = "x86_64" ]; \ - then \ - mv "$(ls /tmp/jdk-8*-linux-x64.tar.gz)" /tmp/jdk.tar.gz ; \ - JAVA_SHA256=b396978a716b7d23ccccabfe5c47c3b75d2434d7f8f7af690bc648172382720d ; \ + ARCH="$(uname -m)"; \ + if [ "$ARCH" = "x86_64" ]; then \ + mv "$(ls /tmp/jdk-8*-linux-x64.tar.gz)" /tmp/jdk.tar.gz; \ + JAVA_SHA256=b396978a716b7d23ccccabfe5c47c3b75d2434d7f8f7af690bc648172382720d; \ else \ - mv "$(ls /tmp/jdk-8*-linux-aarch64.tar.gz)" /tmp/jdk.tar.gz ; \ - JAVA_SHA256=e68d3e31ffcf7f05a4de65d04974843073bdff238bb6524adb272de9e616be7c ; \ - fi && \ + mv "$(ls /tmp/jdk-8*-linux-aarch64.tar.gz)" /tmp/jdk.tar.gz; \ + JAVA_SHA256=e68d3e31ffcf7f05a4de65d04974843073bdff238bb6524adb272de9e616be7c; \ + fi; \ echo "$JAVA_SHA256 */tmp/jdk.tar.gz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ - tar --extract --file /tmp/jdk.tar.gz --directory "$JAVA_HOME" --strip-components 1 + tar --extract --file /tmp/jdk.tar.gz --directory "$JAVA_HOME" --strip-components 1; ## Get a fresh version of Oracle Linux 8 for the final image - FROM oraclelinux:8 -# Default to UTF-8 file.encoding -ENV LANG en_US.UTF-8 +# Default to UTF-8 file encoding +ENV LANG=en_US.UTF-8 +# Set Java environment variables ENV JAVA_HOME=/usr/java/jdk-8 - -ENV PATH $JAVA_HOME/bin:$PATH +ENV PATH=$JAVA_HOME/bin:$PATH # Copy the uncompressed Java Runtime from the builder image COPY --from=builder $JAVA_HOME $JAVA_HOME -## +# Perform system updates and configure alternatives for Java binaries RUN dnf -y update; \ rm -rf /var/cache/dnf; \ ln -sfT "$JAVA_HOME" /usr/java/default; \ ln -sfT "$JAVA_HOME" /usr/java/latest; \ for bin in "$JAVA_HOME/bin/"*; do \ base="$(basename "$bin")"; \ - [ ! -e "/usr/bin/$base" ]; \ - alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \ + [ ! -e "/usr/bin/$base" ] && 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/OracleJava/8/serverjre/Dockerfile b/OracleJava/8/serverjre/Dockerfile index a85774ce43..03cb5248af 100644 --- a/OracleJava/8/serverjre/Dockerfile +++ b/OracleJava/8/serverjre/Dockerfile @@ -23,39 +23,36 @@ # # The builder image will be used to uncompress the tar.gz file with the Java Runtime. -FROM oraclelinux:7-slim as builder +FROM oraclelinux:7-slim AS builder LABEL maintainer="Aurelio Garcia-Ribeyro " -# Since the files is compressed as tar.gz first yum install gzip and tar +# Since the files are compressed as tar.gz, first install gzip and tar RUN yum install -y gzip tar # Default to UTF-8 file.encoding -ENV LANG en_US.UTF-8 +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 SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN set -eux; \ - JAVA_SHA256=7c9a3a87045c226647c09bc1eb1fc832f99a9105dbc924cfeab3bf16b3504d24 ; \ + JAVA_SHA256=7c9a3a87045c226647c09bc1eb1fc832f99a9105dbc924cfeab3bf16b3504d24; \ echo "$JAVA_SHA256 */tmp/jdk.tgz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract --file /tmp/jdk.tgz --directory "$JAVA_HOME" --strip-components 1; ## Get a fresh version of Oracle Linux 7-slim for the final image - FROM oraclelinux:7-slim # Default to UTF-8 file.encoding -ENV LANG en_US.UTF-8 +ENV LANG=en_US.UTF-8 ENV JAVA_HOME=/usr/java/jdk-8 - -ENV PATH $JAVA_HOME/bin:$PATH +ENV PATH="$JAVA_HOME/bin:$PATH" # Copy the uncompressed Java Runtime from the builder image COPY --from=builder $JAVA_HOME $JAVA_HOME @@ -67,10 +64,6 @@ RUN yum -y update; \ ln -sfT "$JAVA_HOME" /usr/java/latest; \ for bin in "$JAVA_HOME/bin/"*; do \ base="$(basename "$bin")"; \ - [ ! -e "/usr/bin/$base" ]; \ - alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \ + [ ! -e "/usr/bin/$base" ] && 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 -# See https://docs.oracle.com/javase/8/docs/technotes/guides/vm/class-data-sharing.html java -Xshare:dump; diff --git a/OracleJava/8/serverjre/Dockerfile.ol8 b/OracleJava/8/serverjre/Dockerfile.ol8 index d63462a202..ececae37f9 100644 --- a/OracleJava/8/serverjre/Dockerfile.ol8 +++ b/OracleJava/8/serverjre/Dockerfile.ol8 @@ -18,59 +18,55 @@ # Run: # $ docker build -t oracle/serverjre:8 . # -# This command is already scripted in build.sh so you can alternatively run +# This command is already scripted in build.sh, so you can alternatively run: # $ bash build.sh 8 # # The builder image will be used to uncompress the tar.gz file with the Java Runtime. -FROM oraclelinux:8 as builder +FROM oraclelinux:8 AS builder LABEL maintainer="Aurelio Garcia-Ribeyro " -# Since the files is compressed as tar.gz first yum install tar. gzip is already in oraclelinux:8 +# Since the file is compressed as tar.gz, install tar. gzip is already included in oraclelinux:8. RUN dnf install -y tar # Default to UTF-8 file.encoding -ENV LANG en_US.UTF-8 +ENV LANG=en_US.UTF-8 # Environment variables for the builder image. -# Required to validate that you are using the correct file - +# 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 SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN set -eux; \ - JAVA_SHA256=7c9a3a87045c226647c09bc1eb1fc832f99a9105dbc924cfeab3bf16b3504d24 ; \ + JAVA_SHA256=7c9a3a87045c226647c09bc1eb1fc832f99a9105dbc924cfeab3bf16b3504d24; \ echo "$JAVA_SHA256 */tmp/jdk.tgz" | sha256sum -c -; \ mkdir -p "$JAVA_HOME"; \ tar --extract --file /tmp/jdk.tgz --directory "$JAVA_HOME" --strip-components 1; ## Get a fresh version of Oracle Linux 8 for the final image - FROM oraclelinux:8 # Default to UTF-8 file.encoding -ENV LANG en_US.UTF-8 +ENV LANG=en_US.UTF-8 ENV JAVA_HOME=/usr/java/jdk-8 - -ENV PATH $JAVA_HOME/bin:$PATH +ENV PATH="$JAVA_HOME/bin:$PATH" # Copy the uncompressed Java Runtime from the builder image COPY --from=builder $JAVA_HOME $JAVA_HOME -## +# Update system and clean cache RUN dnf -y update; \ rm -rf /var/cache/dnf; \ ln -sfT "$JAVA_HOME" /usr/java/default; \ ln -sfT "$JAVA_HOME" /usr/java/latest; \ for bin in "$JAVA_HOME/bin/"*; do \ base="$(basename "$bin")"; \ - [ ! -e "/usr/bin/$base" ]; \ - alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \ + [ ! -e "/usr/bin/$base" ] && 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/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.developer-11 b/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.developer similarity index 90% rename from OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.developer-11 rename to OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.developer index 6a2947d8ad..c56f14f746 100755 --- a/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.developer-11 +++ b/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.developer @@ -22,15 +22,15 @@ # # From the Oracle Docker GitHub Project # -------------------------------------- -FROM oracle/jdk:11 as builder +ARG JAVA_VERSION=jdk:8-ol8 +FROM oracle/$JAVA_VERSION AS builder # Labels -# ------ -LABEL "provider"="Oracle" \ - "maintainer"="Monica Riccelli " \ - "issues"="https://github.com/oracle/docker-images/issues" \ - "port.admin.listen"="7001" \ - "port.administration"="9002" +LABEL provider="Oracle" \ + maintainer="Monica Riccelli " \ + issues="https://github.com/oracle/docker-images/issues" \ + port.admin.listen="7001" \ + port.administration="9002" # Common environment variables required for this build (do NOT change) # -------------------------------------------------------------------- @@ -64,7 +64,7 @@ RUN cd /u01 && ${JAVA_HOME}/bin/jar xf /u01/$FMW_PKG && cd - && \ rm -rf /u01/oracle/cfgtoollogs # Final image stage -FROM oracle/jdk:11 +FROM oracle/$JAVA_VERSION AS runtime ENV ORACLE_HOME=/u01/oracle \ USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ @@ -72,6 +72,14 @@ ENV ORACLE_HOME=/u01/oracle \ HEALTH_SCRIPT_FILE=/u01/oracle/get_healthcheck_url.sh \ PATH=$PATH:${JAVA_HOME}/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin + +# Build arguments +ARG DOMAIN_NAME +ARG ADMIN_LISTEN_PORT +ARG ADMIN_NAME +ARG ADMINISTRATION_PORT_ENABLED +ARG ADMINISTRATION_PORT + # Domain and Server environment variables # ------------------------------------------------------------ ENV DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \ diff --git a/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.developer-8 b/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.developer-8 deleted file mode 100755 index 11e75381bf..0000000000 --- a/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.developer-8 +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright (c) 2020 Oracle and/or its affiliates. -# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -# -# ORACLE DOCKERFILES PROJECT -# -------------------------- -# This is the Dockerfile for WebLogic 14.1.1.0 Quick Install Distro -# -# REQUIRED FILES TO BUILD THIS IMAGE -# ---------------------------------- -# fmw_14.1.1.0.0_wls_lite_quick_Disk1_1of1.zip -# Download the Developer Quick installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html -# -# HOW TO BUILD THIS IMAGE -# ----------------------- -# Put all downloaded files in the same directory as this Dockerfile -# Run: -# $ docker build -f Dockerfile.developer -t oracle/weblogic:14.1.1.0-developer . -# -# IMPORTANT -# --------- -# The resulting image of this Dockerfile contains a WLS Empty Domain. -# -# From the Oracle Docker GitHub Project -# -------------------------------------- -FROM oracle/serverjre:8 as builder - -# Labels -# ------ -LABEL "provider"="Oracle" \ - "maintainer"="Monica Riccelli " \ - "issues"="https://github.com/oracle/docker-images/issues" \ - "port.admin.listen"="7001" \ - "port.administration"="9002" - -# Common environment variables required for this build (do NOT change) -# -------------------------------------------------------------------- -ENV ORACLE_HOME=/u01/oracle \ - USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ - PATH=$PATH:${JAVA_HOME}/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin - -# Setup filesystem and oracle user -# Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation -# ------------------------------------------------------------ -RUN mkdir /u01 && \ - useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle && \ - chown oracle:root -R /u01 && \ - chmod -R 775 /u01 - -# Environment variables required for this build (do NOT change) -# ------------------------------------------------------------- -ENV FMW_PKG=fmw_14.1.1.0.0_wls_lite_quick_Disk1_1of1.zip \ - FMW_JAR=fmw_14.1.1.0.0_wls_lite_quick_generic.jar - -# Copy packages -# ------------- -COPY --chown=oracle:root $FMW_PKG install.file oraInst.loc /u01/ - -# Install -# ------------------------------------------------------------ -USER oracle -RUN cd /u01 && ${JAVA_HOME}/bin/jar xf /u01/$FMW_PKG && cd - && \ - ${JAVA_HOME}/bin/java -jar /u01/$FMW_JAR -silent -responseFile /u01/install.file -invPtrLoc /u01/oraInst.loc -jreLoc $JAVA_HOME -ignoreSysPrereqs -force -novalidation ORACLE_HOME=$ORACLE_HOME && \ - rm /u01/$FMW_JAR /u01/$FMW_PKG /u01/install.file && \ - rm -rf /u01/oracle/cfgtoollogs - -# Final image stage -FROM oracle/serverjre:8 - -ENV ORACLE_HOME=/u01/oracle \ - USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ - SCRIPT_FILE=/u01/oracle/createAndStartEmptyDomain.sh \ - HEALTH_SCRIPT_FILE=/u01/oracle/get_healthcheck_url.sh \ - PATH=$PATH:${JAVA_HOME}/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin - -# Domain and Server environment variables -# ------------------------------------------------------------ -ENV DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \ - ADMIN_LISTEN_PORT="${ADMIN_LISTEN_PORT:-7001}" \ - ADMIN_NAME="${ADMIN_NAME:-AdminServer}" \ - DEBUG_FLAG=true \ - PRODUCTION_MODE=dev \ - ADMINISTRATION_PORT_ENABLED="${ADMINISTRATION_PORT_ENABLED:-true}" \ - ADMINISTRATION_PORT="${ADMINISTRATION_PORT:-9002}" - -# Setup filesystem and oracle user -# Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation -# ------------------------------------------------------------ -RUN mkdir -p /u01 && \ - chmod 775 /u01 && \ - useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle && \ - chown oracle:root /u01 - -COPY --from=builder --chown=oracle:root /u01 /u01 - -# Copy scripts -#------------- -COPY container-scripts/createAndStartEmptyDomain.sh container-scripts/create-wls-domain.py container-scripts/get_healthcheck_url.sh /u01/oracle/ - -RUN chmod +xr $SCRIPT_FILE $HEALTH_SCRIPT_FILE && \ - chown oracle:root $SCRIPT_FILE /u01/oracle/create-wls-domain.py $HEALTH_SCRIPT_FILE - -USER oracle - -HEALTHCHECK --start-period=10s --timeout=30s --retries=3 CMD curl -k -s --fail `$HEALTH_SCRIPT_FILE` || exit 1 -WORKDIR ${ORACLE_HOME} - -# Define default command to start script. -CMD ["/u01/oracle/createAndStartEmptyDomain.sh"] diff --git a/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.generic-11 b/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.generic similarity index 58% rename from OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.generic-11 rename to OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.generic index f322379c4a..9fff21f472 100755 --- a/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.generic-11 +++ b/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.generic @@ -4,78 +4,64 @@ # ORACLE DOCKERFILES PROJECT # -------------------------- # This is the Dockerfile for Oracle WebLogic Server 14.1.1.0 Generic Distro -# -# REQUIRED FILES TO BUILD THIS IMAGE -# ---------------------------------- -# fmw_14.1.1.0.0_wls_lite_Disk1_1of1.zip -# Download the Generic installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html -# -# HOW TO BUILD THIS IMAGE -# ----------------------- -# Put all downloaded files in the same directory as this Dockerfile -# Run: -# $ docker build -f Dockerfile.generic -t oracle/weblogic:14.1.1.0-generic . -# -# IMPORTANT -# --------- -# The resulting image of this Dockerfile contains a WLS Empty Domain. -# -# From the Oracle Docker GitHub Project -# -------------------------------------- -FROM oracle/jdk:11 as builder -# Labels -# ------ -LABEL "provider"="Oracle" \ - "maintainer"="Monica Riccelli " \ - "issues"="https://github.com/oracle/docker-images/issues" \ - "port.admin.listen"="7001" \ - "port.administration"="9002" +# Download the Generic installer from: +# http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html +# Base image +ARG JAVA_VERSION=serverjre:8-ol8 +FROM oracle/$JAVA_VERSION AS builder -# Common environment variables required for this build (do NOT change) -# -------------------------------------------------------------------- +# Labels +LABEL provider="Oracle" \ + maintainer="Monica Riccelli " \ + issues="https://github.com/oracle/docker-images/issues" \ + port.admin.listen="7001" \ + port.administration="9002" + +# Common environment variables required for this build ENV ORACLE_HOME=/u01/oracle \ USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ PATH=$PATH:${JAVA_HOME}/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin # Setup filesystem and oracle user -# Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation -# ------------------------------------------------------------ RUN mkdir /u01 && \ useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle && \ chown oracle:root -R /u01 && \ chmod -R 775 /u01 -# Environment variables required for this build (do NOT change) -# ------------------------------------------------------------- +# Environment variables required for this build ENV FMW_PKG=fmw_14.1.1.0.0_wls_lite_Disk1_1of1.zip \ FMW_JAR=fmw_14.1.1.0.0_wls_lite_generic.jar # Copy packages -# ------------- COPY --chown=oracle:root $FMW_PKG install.file oraInst.loc /u01/ -# Install -# ------------------------------------------------------------ +# Install WebLogic USER oracle - RUN cd /u01 && ${JAVA_HOME}/bin/jar xf /u01/$FMW_PKG && cd - && \ ${JAVA_HOME}/bin/java -jar /u01/$FMW_JAR -silent -responseFile /u01/install.file -invPtrLoc /u01/oraInst.loc -jreLoc $JAVA_HOME -ignoreSysPrereqs -force -novalidation ORACLE_HOME=$ORACLE_HOME INSTALL_TYPE="WebLogic Server" && \ rm /u01/$FMW_JAR /u01/$FMW_PKG /u01/install.file && \ rm -rf /u01/oracle/cfgtoollogs # Final image stage -FROM oracle/jdk:11 +FROM oracle/$JAVA_VERSION AS runtime +# Environment variables for runtime ENV ORACLE_HOME=/u01/oracle \ USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ SCRIPT_FILE=/u01/oracle/createAndStartEmptyDomain.sh \ HEALTH_SCRIPT_FILE=/u01/oracle/get_healthcheck_url.sh \ PATH=$PATH:${JAVA_HOME}/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin -# Domain and Server environment variables -# ------------------------------------------------------------ +# Build arguments +ARG DOMAIN_NAME +ARG ADMIN_LISTEN_PORT +ARG ADMIN_NAME +ARG ADMINISTRATION_PORT_ENABLED +ARG ADMINISTRATION_PORT + +# Domain and Server environment variables (runtime) ENV DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \ ADMIN_LISTEN_PORT="${ADMIN_LISTEN_PORT:-7001}" \ ADMIN_NAME="${ADMIN_NAME:-AdminServer}" \ @@ -83,26 +69,29 @@ ENV DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \ ADMINISTRATION_PORT="${ADMINISTRATION_PORT:-9002}" # Setup filesystem and oracle user -# Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation -# ------------------------------------------------------------ RUN mkdir -p /u01 && \ chmod 775 /u01 && \ useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle && \ chown oracle:root /u01 +# Copy the installed WebLogic from the builder stage COPY --from=builder --chown=oracle:root /u01 /u01 # Copy scripts -#------------- COPY container-scripts/createAndStartEmptyDomain.sh container-scripts/create-wls-domain.py container-scripts/get_healthcheck_url.sh /u01/oracle/ +# Set permissions on scripts RUN chmod +xr $SCRIPT_FILE $HEALTH_SCRIPT_FILE && \ chown oracle:root $SCRIPT_FILE /u01/oracle/create-wls-domain.py $HEALTH_SCRIPT_FILE +# Set the user to oracle for the final image USER oracle +# Healthcheck for WebLogic HEALTHCHECK --start-period=10s --timeout=30s --retries=3 CMD curl -k -s --fail `$HEALTH_SCRIPT_FILE` || exit 1 + +# Set working directory WORKDIR ${ORACLE_HOME} -# Define default command to start script. +# Define default command to start WebLogic CMD ["/u01/oracle/createAndStartEmptyDomain.sh"] diff --git a/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.generic-8 b/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.generic-8 deleted file mode 100755 index 7fe3d241d3..0000000000 --- a/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.generic-8 +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright (c) 2020 Oracle and/or its affiliates. -# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -# -# ORACLE DOCKERFILES PROJECT -# -------------------------- -# This is the Dockerfile for Oracle WebLogic Server 14.1.1.0 Generic Distro -# -# REQUIRED FILES TO BUILD THIS IMAGE -# ---------------------------------- -# fmw_14.1.1.0.0_wls_lite_Disk1_1of1.zip -# Download the Generic installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html -# -# HOW TO BUILD THIS IMAGE -# ----------------------- -# Put all downloaded files in the same directory as this Dockerfile -# Run: -# $ docker build -f Dockerfile.generic -t oracle/weblogic:14.1.1.0-generic . -# -# IMPORTANT -# --------- -# The resulting image of this Dockerfile contains a WLS Empty Domain. -# -# From the Oracle Docker GitHub Project -# -------------------------------------- -FROM oracle/serverjre:8 as builder - -# Labels -# ------ -LABEL "provider"="Oracle" \ - "maintainer"="Monica Riccelli " \ - "issues"="https://github.com/oracle/docker-images/issues" \ - "port.admin.listen"="7001" \ - "port.administration"="9002" - - -# Common environment variables required for this build (do NOT change) -# -------------------------------------------------------------------- -ENV ORACLE_HOME=/u01/oracle \ - USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ - PATH=$PATH:${JAVA_HOME}/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin - -# Setup filesystem and oracle user -# Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation -# ------------------------------------------------------------ -RUN mkdir /u01 && \ - useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle && \ - chown oracle:root -R /u01 && \ - chmod -R 775 /u01 - -# Environment variables required for this build (do NOT change) -# ------------------------------------------------------------- -ENV FMW_PKG=fmw_14.1.1.0.0_wls_lite_Disk1_1of1.zip \ - FMW_JAR=fmw_14.1.1.0.0_wls_lite_generic.jar - -# Copy packages -# ------------- -COPY --chown=oracle:root $FMW_PKG install.file oraInst.loc /u01/ - -# Install -# ------------------------------------------------------------ -USER oracle - -RUN cd /u01 && ${JAVA_HOME}/bin/jar xf /u01/$FMW_PKG && cd - && \ - ${JAVA_HOME}/bin/java -jar /u01/$FMW_JAR -silent -responseFile /u01/install.file -invPtrLoc /u01/oraInst.loc -jreLoc $JAVA_HOME -ignoreSysPrereqs -force -novalidation ORACLE_HOME=$ORACLE_HOME INSTALL_TYPE="WebLogic Server" && \ - rm /u01/$FMW_JAR /u01/$FMW_PKG /u01/install.file && \ - rm -rf /u01/oracle/cfgtoollogs - -# Final image stage -FROM oracle/serverjre:8 - -ENV ORACLE_HOME=/u01/oracle \ - USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ - SCRIPT_FILE=/u01/oracle/createAndStartEmptyDomain.sh \ - HEALTH_SCRIPT_FILE=/u01/oracle/get_healthcheck_url.sh \ - PATH=$PATH:${JAVA_HOME}/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin - -# Domain and Server environment variables -# ------------------------------------------------------------ -ENV DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \ - ADMIN_LISTEN_PORT="${ADMIN_LISTEN_PORT:-7001}" \ - ADMIN_NAME="${ADMIN_NAME:-AdminServer}" \ - ADMINISTRATION_PORT_ENABLED="${ADMINISTRATION_PORT_ENABLED:-true}" \ - ADMINISTRATION_PORT="${ADMINISTRATION_PORT:-9002}" - -# Setup filesystem and oracle user -# Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation -# ------------------------------------------------------------ -RUN mkdir -p /u01 && \ - chmod 775 /u01 && \ - useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle && \ - chown oracle:root /u01 - -COPY --from=builder --chown=oracle:root /u01 /u01 - -# Copy scripts -#------------- -COPY container-scripts/createAndStartEmptyDomain.sh container-scripts/create-wls-domain.py container-scripts/get_healthcheck_url.sh /u01/oracle/ - -RUN chmod +xr $SCRIPT_FILE $HEALTH_SCRIPT_FILE && \ - chown oracle:root $SCRIPT_FILE /u01/oracle/create-wls-domain.py $HEALTH_SCRIPT_FILE - -USER oracle - -HEALTHCHECK --start-period=10s --timeout=30s --retries=3 CMD curl -k -s --fail `$HEALTH_SCRIPT_FILE` || exit 1 -WORKDIR ${ORACLE_HOME} - -# Define default command to start script. -CMD ["/u01/oracle/createAndStartEmptyDomain.sh"] diff --git a/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.slim-11 b/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.slim similarity index 90% rename from OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.slim-11 rename to OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.slim index a2cedef264..54ff4e3722 100755 --- a/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.slim-11 +++ b/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.slim @@ -22,16 +22,16 @@ # # From the Oracle Docker GitHub Project # ---------------------------------------- -FROM oracle/jdk:11 as builder +ARG JAVA_VERSION=serverjre:8-ol8 +FROM oracle/$JAVA_VERSION AS builder # Labels # ------ -LABEL provider="Oracle" \ - maintainer="Monica Riccelli " \ - issues="https://github.com/oracle/docker-images/issues" \ - "port.admin.listen"="7001" \ - "port.administration"="9002" - + LABEL provider="Oracle" \ + maintainer="Monica Riccelli " \ + issues="https://github.com/oracle/docker-images/issues" \ + port.admin.listen="7001" \ + port.administration="9002" # Common environment variables required for this build (do NOT change) # -------------------------------------------------------------------- @@ -66,7 +66,7 @@ RUN cd /u01 && ${JAVA_HOME}/bin/jar xf /u01/$FMW_PKG && cd - && \ rm -rf /u01/oracle/cfgtoollogs # Final image stage -FROM oracle/jdk:11 +FROM oracle/$JAVA_VERSION AS runtime ENV ORACLE_HOME=/u01/oracle \ USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ @@ -74,6 +74,13 @@ ENV ORACLE_HOME=/u01/oracle \ HEALTH_SCRIPT_FILE=/u01/oracle/get_healthcheck_url.sh \ PATH=$PATH:${JAVA_HOME}/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin +# Build arguments +ARG DOMAIN_NAME +ARG ADMIN_LISTEN_PORT +ARG ADMIN_NAME +ARG ADMINISTRATION_PORT_ENABLED +ARG ADMINISTRATION_PORT + # Domain and Server environment variables # ------------------------------------------------------------ ENV DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \ diff --git a/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.slim-8 b/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.slim-8 deleted file mode 100755 index 00c4896d89..0000000000 --- a/OracleWebLogic/dockerfiles/14.1.1.0/Dockerfile.slim-8 +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright (c) 2020 Oracle and/or its affiliates. -# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -# -# ORACLE DOCKERFILES PROJECT -# -------------------------- -# This is the Dockerfile for Oracle WebLogic Server 14.1.1.0 Slim Distro -# -# REQUIRED FILES TO BUILD THIS IMAGE -# ---------------------------------- -# fmw_14.1.1.0.0_wls_lite_slim_Disk1_1of1.zip -# Download the Slim installer from http://www.oracle.com/technetwork/middleware/weblogic/downloads/wls-for-dev-1703574.html -# -# HOW TO BUILD THIS IMAGE -# ----------------------- -# Put all downloaded files in the same directory as this Dockerfile -# Run: -# $ docker build -f Dockerfile.slim -t oracle/weblogic:14.1.1.0-slim . -# -# IMPORTANT -# --------- -# The resulting image of this Dockerfile contains a WLS Empty Domain. -# -# From the Oracle Docker GitHub Project -# ---------------------------------------- -FROM oracle/serverjre:8 as builder - -# Labels -# ------ -LABEL provider="Oracle" \ - maintainer="Monica Riccelli " \ - issues="https://github.com/oracle/docker-images/issues" \ - "port.admin.listen"="7001" \ - "port.administration"="9002" - - -# Common environment variables required for this build (do NOT change) -# -------------------------------------------------------------------- -ENV ORACLE_HOME=/u01/oracle \ - USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ - PATH=$PATH:${JAVA_HOME}/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin - -# Setup filesystem and oracle user -# Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation -# ------------------------------------------------------------ -RUN mkdir /u01 && \ - useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle && \ - chown oracle:root -R /u01 && \ - chmod -R 775 /u01 - -# Environment variables required for this build (do NOT change) -# ------------------------------------------------------------- -ENV FMW_PKG=fmw_14.1.1.0.0_wls_lite_slim_Disk1_1of1.zip \ - FMW_JAR=fmw_14.1.1.0.0_wls_lite_quick_slim_generic.jar - -# Copy packages -# ------------- -COPY --chown=oracle:root $FMW_PKG install.file oraInst.loc /u01/ - -# Install -# ------------------------------------------------------------ -USER oracle - -RUN cd /u01 && ${JAVA_HOME}/bin/jar xf /u01/$FMW_PKG && cd - && \ - ${JAVA_HOME}/bin/java -jar /u01/$FMW_JAR -silent -responseFile /u01/install.file -invPtrLoc /u01/oraInst.loc -jreLoc $JAVA_HOME -ignoreSysPrereqs -force -novalidation ORACLE_HOME=$ORACLE_HOME && \ - rm /u01/$FMW_JAR /u01/$FMW_PKG /u01/install.file && \ - rm -rf /u01/oracle/cfgtoollogs - -# Final image stage -FROM oracle/serverjre:8 - -ENV ORACLE_HOME=/u01/oracle \ - USER_MEM_ARGS="-Djava.security.egd=file:/dev/./urandom" \ - SCRIPT_FILE=/u01/oracle/createAndStartEmptyDomain.sh \ - HEALTH_SCRIPT_FILE=/u01/oracle/get_healthcheck_url.sh \ - PATH=$PATH:${JAVA_HOME}/bin:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin - -# Domain and Server environment variables -# ------------------------------------------------------------ -ENV DOMAIN_NAME="${DOMAIN_NAME:-base_domain}" \ - ADMIN_LISTEN_PORT="${ADMIN_LISTEN_PORT:-7001}" \ - ADMIN_NAME="${ADMIN_NAME:-AdminServer}" \ - ADMINISTRATION_PORT_ENABLED="${ADMINISTRATION_PORT_ENABLED:-true}" \ - ADMINISTRATION_PORT="${ADMINISTRATION_PORT:-9002}" \ - DEBUG_flag=false \ - PRODUCTION_MODE=prod - -# Setup filesystem and oracle user -# Adjust file permissions, go to /u01 as user 'oracle' to proceed with WLS installation -# ------------------------------------------------------------ -RUN mkdir -p /u01 && \ - chmod 775 /u01 && \ - useradd -b /u01 -d /u01/oracle -m -s /bin/bash oracle && \ - chown oracle:root /u01 - -COPY --from=builder --chown=oracle:root /u01 /u01 - -# Copy scripts -#------------- -COPY container-scripts/createAndStartEmptyDomain.sh container-scripts/create-wls-domain.py container-scripts/get_healthcheck_url.sh /u01/oracle/ - -RUN chmod +xr $SCRIPT_FILE $HEALTH_SCRIPT_FILE && \ - chown oracle:root $SCRIPT_FILE /u01/oracle/create-wls-domain.py $HEALTH_SCRIPT_FILE - -USER oracle - -HEALTHCHECK --start-period=10s --timeout=30s --retries=3 CMD curl -k -s --fail `$HEALTH_SCRIPT_FILE` || exit 1 -WORKDIR ${ORACLE_HOME} - -# Define default command to start script. -CMD ["/u01/oracle/createAndStartEmptyDomain.sh"] diff --git a/OracleWebLogic/dockerfiles/buildDockerImage.sh b/OracleWebLogic/dockerfiles/buildDockerImage.sh index 80b9238668..58af6edc0e 100755 --- a/OracleWebLogic/dockerfiles/buildDockerImage.sh +++ b/OracleWebLogic/dockerfiles/buildDockerImage.sh @@ -20,7 +20,7 @@ Parameters: Choose one of: $(for i in $(ls -d */); do echo -n "${i%%/} "; done) -d: creates image based on 'developer' distribution -g: creates image based on 'generic' distribution - -j: choose '8' to create a 14.1.1.0 image with JDK 8 or '11' to create a 14.1.1.0 image with JDK 11. + -j: choose '8' to create a 14.1.1.0 image with JDK(or JRE) 8 or '11' to create a 14.1.1.0 image with JDK(or JRE) 11. -m: creates image based on 'slim' distribution -c: enables Docker image layer cache during build -s: skips the MD5 check of packages @@ -37,7 +37,7 @@ exit 0 # Validate packages validateJDK() { - if [ "$VERSION" == "14.1.1.0" ]; then + if [ "$VERSION" = "14.1.1.0" ]; then if [ "$JDKVER" != 8 -a "$JDKVER" != 11 ]; then echo "WebLogic Server 14.1.1.0 supports JDK 8 and 11. JDK version $JDKVER is not supported." exit 1 @@ -84,19 +84,19 @@ while getopts "hsdgmc:j:v:" optname; do ;; "j") JDKVER="$OPTARG" - echo "Set- JDK Version $JDKVER" + echo "Set -> JDK Version $JDKVER" ;; "m") SLIM=1 - echo "Set- Distribution:Slim" + echo "Set -> Distribution:Slim" ;; "v") VERSION="$OPTARG" - echo "Set- WebLogic's Version $VERSION" + echo "Set -> WebLogic's Version $VERSION" ;; "c") NOCACHE=false - echo "Set- NOCACHE to false" + echo "Set -> NOCACHE to false" ;; *) # Should not occur @@ -122,18 +122,11 @@ fi # For WLS 14.1.1.0 Validate JDK is 8 or 11 validateJDK -# Which JDK FOR VERSION 14.1.1.0 -if [ "$VERSION" == "14.1.1.0" ]; then - DIST="$DISTRIBUTION-$JDKVER" - echo "Version= $VERSION Distribution= $DIST" -else - DIST="$DISTRIBUTION" - echo "Version= $VERSION Distribution= $DIST" -fi - +DIST="$DISTRIBUTION" +echo "Version -> $VERSION, Distribution -> $DIST" # WebLogic Image Name -IMAGE_NAME="oracle/weblogic:$VERSION-$DIST" +IMAGE_NAME="oracle/weblogic:$VERSION" # Go into version folder cd $VERSION @@ -172,7 +165,7 @@ fi # BUILDING THE IMAGE # # ################## # echo "Building image '$IMAGE_NAME' ..." -echo "Building image using Dockerfile.'$DIST'" +echo "Building image using Dockerfile.$DIST" # BUILD THE IMAGE (replace all environment variables) BUILD_START=$(date '+%s') From 150ee48907ac0ac5f59e1886726f6ec28e14a26b Mon Sep 17 00:00:00 2001 From: Marcos Caputo Date: Sat, 19 Oct 2024 09:10:22 -0300 Subject: [PATCH 2/2] Update Oracle WebLogic and Java Dockerfiles for version 14.1.1.0 - Standardized Dockerfile formatting (e.g., uppercase `AS` in multi-stage builds) - Fixed minor grammatical issues in comments for clarity - Improved environment variable definitions with consistent syntax - Refined system update commands and alternatives configuration for Java binaries - Removed deprecated Dockerfiles for developer, generic, and slim distributions - Updated buildDockerImage.sh script for better compatibility with JDK 8/11 This update ensures consistency across the Dockerfiles and improves build stability. Signed-off-by: Marcos Caputo