Merge branch 'master' of github.com:fuzziebrain/docker-apex-stack

Author: fuzziebrain

01-build.sh

@@ -52,7 +52,10 @@ mv tmp/OracleDatabase/SingleInstance/dockerfiles/ .
 rm -rf tmp/
 
 echo "##### Staging RPM #####"
-if [ $DB_VERSION = '19.3.0' ]; then
+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
@@ -75,6 +78,7 @@ else
   echo "Unknown or unsupported database version and/or edition."
 fi
 
+# TODO: test OML4R support for 21.3.0
 if [[ $OML4R_SUPPORT =~ (Y|y) ]]; then
   if [[
     ($DB_VERSION = '19.3.0')

README.md

@@ -17,7 +17,7 @@
 
 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 19.3 as of April 25, 2019). **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 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).
     * [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.

settings_db19c.env.sample

@@ -21,7 +21,7 @@ APEX_REST_PUBLIC_USER_PWD=Oracle19_3
 ORDS_PUBLIC_USER_PWD=Oracle19_4
 INSTALL_FILE_APEX=apex_21.1.zip
 INSTALL_FILE_ORDS=ords-21.2.0.174.1826.zip
-INSTALL_FILE_JAVA=server-jre-8u291-linux-x64.tar.gz
+INSTALL_FILE_JAVA=server-jre-8u301-linux-x64.tar.gz
 DOCKER_ORDS_PORT=50080
 DOCKER_EM_PORT=55500
 DOCKER_DB_PORT=51521

settings_db21c.env.sample

@@ -0,0 +1,37 @@
+# Description
+# ===========
+# * Oracle Database 21c Enterprise Edition
+# * Database features:
+#     * Patching allowed? No
+#     * OML4R supported? No
+# * ORDS features:
+#     * REST-enabled? Yes
+#     * SQL Developer Web? Yes
+#     * Database API? Yes
+# * Java 8 server runtime engine downloaded from Oracle
+
+ORACLE_SID=ORCL
+ORACLE_PDB=PDB01
+ORACLE_PWD=Oracle21
+APEX_ADMIN_EMAIL=myemail@domain.com
+APEX_ADMIN_PWD=Oracle__21
+APEX_PUBLIC_USER_PWD=Oracle21_1
+APEX_LISTENER_PWD=Oracle21_2
+APEX_REST_PUBLIC_USER_PWD=Oracle21_3
+ORDS_PUBLIC_USER_PWD=Oracle21_4
+INSTALL_FILE_APEX=apex_21.1.zip
+INSTALL_FILE_ORDS=ords-21.2.0.174.1826.zip
+INSTALL_FILE_JAVA=server-jre-8u301-linux-x64.tar.gz
+DOCKER_ORDS_PORT=50080
+DOCKER_EM_PORT=55500
+DOCKER_DB_PORT=51521
+DB_VERSION=21.3.0
+DB_EDITION=ee
+DOCKER_NETWORK_NAME=das_network
+ALLOW_DB_PATCHING=N
+OML4R_SUPPORT=N
+REST_ENABLED_SQL=Y
+RTU_ENABLED=N
+SQLDEVWEB=Y
+DATABASEAPI=Y
+FILES_DIR=/software/oracle