Merge pull request #47 from fuzziebrain/temp-xe21c-support

Temp xe21c support

Author: fuzziebrain

01-build.sh

@@ -44,38 +44,46 @@ if [ -d 'dockerfiles' ]; then
   rm -rf dockerfiles;
 fi
 
-echo "##### Grabbing official Docker images from Oracle #####"
-git clone https://github.com/oracle/docker-images.git tmp
-
-mv tmp/OracleDatabase/SingleInstance/dockerfiles/ .
-
-rm -rf tmp/
-
-echo "##### Staging RPM #####"
-if [ $DB_VERSION = '21.3.0' ]; then
-  cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_213000_db_home.zip
-  DOCKER_FILE=Dockerfile
-elif [ $DB_VERSION = '19.3.0' ]; then
-  cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_193000_db_home.zip
-  DOCKER_FILE=Dockerfile
-elif [ $DB_VERSION = '18.4.0' ] && [ $DB_EDITION = 'xe' ]; then
-  cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-database-xe-18c-1.0-1.x86_64.rpm
-  DOCKER_FILE=Dockerfile.$DB_EDITION
-elif [ $DB_VERSION = '18.3.0' ]; then
-  cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_180000_db_home.zip
-  DOCKER_FILE=Dockerfile
-elif [ $DB_VERSION = '12.2.0.1' ]; then
-  cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxx64_12201_database.zip
-  DOCKER_FILE=Dockerfile
-elif [ $DB_VERSION = '12.1.0.2' ]; then
-  cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxamd64_12102_database_1of2.zip
-  cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxamd64_12102_database_2of2.zip
-  DOCKER_FILE=Dockerfile.$DB_EDITION
-elif [ $DB_VERSION = '11.2.0.2' ]; then
-  cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
-  DOCKER_FILE=Dockerfile.$DB_EDITION
+if [ $DB_VERSION = '21.3.0' ] && [ $DB_EDITION = 'xe' ]; then
+  echo "##### Grabbing custom Docker images from Oracle #####"
+  git clone https://github.com/fuzziebrain/docker-oracledb21c-xe.git
+
+  mkdir dockerfiles
+  mv docker-oracledb21c-xe dockerfiles/$DB_VERSION
 else
-  echo "Unknown or unsupported database version and/or edition."
+  echo "##### Grabbing official Docker images from Oracle #####"
+  git clone https://github.com/oracle/docker-images.git tmp
+
+  mv tmp/OracleDatabase/SingleInstance/dockerfiles/ .
+
+  rm -rf tmp/
+
+  echo "##### Staging RPM #####"
+  if [ $DB_VERSION = '21.3.0' ]; then
+    cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_213000_db_home.zip
+    DOCKER_FILE=Dockerfile
+  elif [ $DB_VERSION = '19.3.0' ]; then
+    cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_193000_db_home.zip
+    DOCKER_FILE=Dockerfile
+  elif [ $DB_VERSION = '18.4.0' ] && [ $DB_EDITION = 'xe' ]; then
+    cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-database-xe-18c-1.0-1.x86_64.rpm
+    DOCKER_FILE=Dockerfile.$DB_EDITION
+  elif [ $DB_VERSION = '18.3.0' ]; then
+    cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_180000_db_home.zip
+    DOCKER_FILE=Dockerfile
+  elif [ $DB_VERSION = '12.2.0.1' ]; then
+    cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxx64_12201_database.zip
+    DOCKER_FILE=Dockerfile
+  elif [ $DB_VERSION = '12.1.0.2' ]; then
+    cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxamd64_12102_database_1of2.zip
+    cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/linuxamd64_12102_database_2of2.zip
+    DOCKER_FILE=Dockerfile.$DB_EDITION
+  elif [ $DB_VERSION = '11.2.0.2' ]; then
+    cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-xe-11.2.0-1.0.x86_64.rpm.zip
+    DOCKER_FILE=Dockerfile.$DB_EDITION
+  else
+    echo "Unknown or unsupported database version and/or edition."
+  fi
 fi
 
 # TODO: test OML4R support for 21.3.0
@@ -110,7 +118,11 @@ if [[ $ALLOW_DB_PATCHING =~ (Y|y) ]]; then
 fi
 
 echo "##### Building Docker Image for Oracle Database ${DB_VERSION} ${DB_EDITION} #####"
-cd dockerfiles && . buildContainerImage.sh -v ${DB_VERSION} ${DB_EDITION_FLAG}
+if [ $DB_VERSION = '21.3.0' ] && [ $DB_EDITION = 'xe' ]; then
+  cd dockerfiles/${DB_VERSION} && docker build -t oracle/database:${DB_VERSION}-${DB_EDITION} .
+else
+  cd dockerfiles && . buildContainerImage.sh -v ${DB_VERSION} ${DB_EDITION_FLAG}
+fi
 
 cd $BASE_DIR
 echo "##### Done #####"

README.md

@@ -17,10 +17,10 @@
 
 1. Git clone this repository and set it as the working directory.
 1. Download the installer files:
-    * The required Oracle Database installation files from [OTN](https://www.oracle.com/technetwork/database/) (supports versions up to 21.3.0 as of August 17, 2021). **Note:** For [Oracle Database 18c XE](https://oracle.com/xe), you are no longer required to download the binaries (see issue #39).
+    * The required Oracle Database installation files from [OTN](https://www.oracle.com/technetwork/database/) (supports versions up to 21.3.0 including Express Edition, as of September 22, 2021). **Note:** For [Oracle Database 21c XE](https://oracle.com/xe), you are no longer required to download the binaries (see issue #39).
     * [Oracle Application Express](https://apex.oracle.com/download) (supports versions up 21.1 as of May 12, 2021)
     * [Oracle REST Data Services](https://www.oracle.com/technetwork/developer-tools/rest-data-services/downloads/index.html) (supports versions up to 21.2.0.174.1826 as of July 10, 2021)
-1. For releases after [0.6.0](https://github.com/fuzziebrain/docker-apex-stack/releases/tag/0.6.0), either choose to use the binaries from [OpenJDK](https://openjdk.java.net/) or download a licensed Java runtime from Oracle. Please refer to the additonal notes section [below](#Additional-Notes-About-the-Settings-File) for details about the `INSTALL_FILE_JAVA` parameter.
+1. For releases after [0.6.0](https://github.com/fuzziebrain/docker-apex-stack/releases/tag/0.6.0), either choose to use the binaries from [OpenJDK](https://openjdk.java.net/), download a licensed Java runtime, or the [free to use](https://blogs.oracle.com/java/post/free-java-license) Java 17 from Oracle. Please refer to the additonal notes section [below](#Additional-Notes-About-the-Settings-File) for details about the `INSTALL_FILE_JAVA` parameter.
 1. Place all installer files in the sub-directory `files`.
 1. Create a file that contains the required environment variables for your build. Please refer to the additonal notes [below](#Additional-Notes-About-the-Settings-File) for more information about the various parameters that can be set. Included in this repository are two examples or templates that you can use:
     * [`settings.env.sample`](./settings.env.sample).
@@ -44,6 +44,8 @@
 1. Enter `Y` to continue.
 1. Wait till there is minimal or no activity in the script then go to http://localhost:50080/ords/apex.
 
+If you are new to APEX, then I highly recommend checking out some of the learning resources [here](https://apex.oracle.com/en/learn/).
+
 ```
 $ ./quickstart.sh
 Enter an email address for your APEX administrator (required): apexdev@example.com
@@ -70,8 +72,9 @@ Type "Y" to continue or CTRL-C to exit: y
 * SQL Developer Web is now availablel with ORDS version 19.4. This feature is enabled by default. To turn it off, set the environment variable `SQLDEVWEB` to `N`. The REST-enabled SQL feature can be managed by the variable `REST_ENABLED_SQL`, but note that this value is ignored if SQL Developer Web is activated. For builds with earlier ORDS versions, the added configuration properties are safely ignored.
 * `DATABASEAPI` parameter added to enable Database API support for ORDS 19.x and later.
 * The variable `INSTALL_FILE_JAVA` accepts the following values:
-    * `openjdk1.8`
+    * `java17`
     * `openjdk11`
+    * `openjdk1.8`
     * The filename of Java runtime tarball that you can download from [here](https://www.oracle.com/technetwork/java/javase/downloads/). It is recommended that you download the latest Java 8 server JRE, e.g. `server-jre-8u291-linux-x64.tar.gz`.
 * Using the sample settings, the following are accessible:
     | Port | Application | URL |

quickstart.sh

@@ -57,11 +57,11 @@ APEX_REST_PUBLIC_USER_PWD=$ORACLE_PWD
 ORDS_PUBLIC_USER_PWD=$ORACLE_PWD
 INSTALL_FILE_APEX=apex-latest.zip
 INSTALL_FILE_ORDS=ords-latest.zip
-INSTALL_FILE_JAVA=openjdk11
+INSTALL_FILE_JAVA=java17
 DOCKER_ORDS_PORT=50080
 DOCKER_EM_PORT=55500
 DOCKER_DB_PORT=51521
-DB_VERSION=18.4.0
+DB_VERSION=21.3.0
 DB_EDITION=xe
 DOCKER_NETWORK_NAME=das_network
 ALLOW_DB_PATCHING=N

scripts/setup/01-install.sh

@@ -6,7 +6,9 @@ export SCRIPT_DIR=$SCRIPTS_ROOT
 export FILES_DIR=/tmp/files
 
 echo "##### Install dependencies if required #####"
-if [ $INSTALL_FILE_JAVA == 'openjdk1.8' ]; then
+if [ $INSTALL_FILE_JAVA == 'java17' ]; then
+  yum install -y https://download.oracle.com/java/17/latest/jdk-17_linux-x64_bin.rpm
+elif [ $INSTALL_FILE_JAVA == 'openjdk1.8' ]; then
   yum install -y java-1.8.0-openjdk
 elif [ $INSTALL_FILE_JAVA == 'openjdk11' ]; then
   yum install -y java-11-openjdk