Support majority of DB version and editions.

Author: fuzziebrain

.gitignore

@@ -84,8 +84,9 @@ $RECYCLE.BIN/
 # End of https://www.gitignore.io/api/osx,macos,linux,windows
 *.zip
 *.rpm
+*.tar
+*.gz
 tmp
 dockerfiles
 oradata
-!sample.env
 *.env

01-build.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+
+ENV_FILE=${1:-.env}
+
+. $ENV_FILE
+
+BASE_DIR=$(pwd -P)
+DB_VERSION=${DB_VERSION:-18.4.0}
+DB_EDITION=$(echo ${DB_EDITION:-xe} | tr '[:upper:]' '[:lower:]')
+
+case "$DB_EDITION" in
+  "ee")
+    DB_EDITION_FLAG=-e
+    ;;
+  "se2")
+    DB_EDITION_FLAG=-s
+    ;;
+  *)
+    DB_EDITION_FLAG=-x
+    ;;
+esac
+
+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 = '18.4.0' ] && [ $DB_EDITION = 'xe' ]; then
+  cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$BASE_DIR/files/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://$BASE_DIR/files/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://$BASE_DIR/files/linuxx64_12201_database.zip
+  DOCKER_FILE=Dockerfile
+elif [ $DB_VERSION = '12.1.0.2' ]; then
+  cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$BASE_DIR/files/linuxamd64_12102_database_1of2.zip
+  cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$BASE_DIR/files/linuxamd64_12102_database_2of2.zip
+  DOCKER_FILE=Dockerfile.$DB_EDITION
+else
+  echo "Unknown or unsupported database version and/or edition."
+fi
+
+cd $BASE_DIR
+
+# echo "##### Modify target Dockerfile #####"
+# REPLACEMENT_STRING="COPY scripts/setup/ \$ORACLE_BASE/scripts/setup/\nCOPY scripts/startup/ \$ORACLE_BASE/scripts/startup/\nCOPY files/ /tmp/files/\n"
+# sed -i -r "s|^VOLUME.+$|${REPLACEMENT_STRING}|g" dockerfiles/${DB_VERSION}/${DOCKER_FILE:-Dockerfile}
+# mkdir -p dockerfiles/${DB_VERSION}/files
+# cp files/$INSTALL_FILE_APEX files/$INSTALL_FILE_ORDS files/$INSTALL_FILE_JAVA dockerfiles/${DB_VERSION}/files/
+# cp -R scripts dockerfiles/${DB_VERSION}/scripts
+
+echo "##### Building Docker Image for Oracle Database ${DB_VERSION} ${DB_EDITION} #####"
+cd dockerfiles && . buildDockerImage.sh -v ${DB_VERSION} ${DB_EDITION_FLAG}
+
+cd $BASE_DIR
+echo "##### Done #####"

01-stage.sh

@@ -5,6 +5,10 @@ ENV_FILE=${2:-.env}
 
 . $ENV_FILE
 
+BASE_DIR=$(pwd -P)
+DB_VERSION=${DB_VERSION:-18.4.0}
+DB_EDITION=$(echo ${DB_EDITION:-xe} | tr '[:upper:]' '[:lower:]')
+
 echo "##### Removing any previous containers #####"
 docker rm -vf $CONTAINER_NAME
 
@@ -25,7 +29,7 @@ docker run -d --name $CONTAINER_NAME \
         -v $PWD/scripts/setup:/opt/oracle/scripts/setup \
         -v $PWD/scripts/startup:/opt/oracle/scripts/startup \
         -v $PWD/files:/tmp/files \
-        oracle/database:18.4.0-xe
+        oracle/database:${DB_VERSION}-${DB_EDITION}
 
 echo "##### Tailing logs. Ctrl-C to exit. #####"
 docker logs -f $CONTAINER_NAME

02-build.sh

@@ -18,15 +18,12 @@
 
 1. Git clone this repository and set it as the working directory.
 2. Download the installer files:
-    * [Oracle Database 18c XE](https://oracle.com/xe)
+    * [Oracle Database 18c XE](https://oracle.com/xe) or any of the required installation files from [OTN](https://www.oracle.com/technetwork/database/)
     * [Oracle Application Express](https://apex.oracle.com/download) (the latest version is 19.1 as of March 29, 2019)
     * [Oracle REST Data Services](https://www.oracle.com/technetwork/developer-tools/rest-data-services/downloads/index.html) (the latest version is 18.4 as of February 16, 2019)
+    * [Java Development Kit SE 8](https://www.oracle.com/technetwork/java/javase/downloads/)
 3. Place all three files in the sub-directory `files`.
-4. Run the first script to grab the latest Docker [images](https://github.com/oracle/docker-images) from Oracle:
-    ```bash
-    $ . 01-stage.sh
-    ```
-5. Create a new file that contains the required variables. The `sample.env` file is provided but should **not** be used directly. Make a copy, e.g. `mysettings.env`, and modify as desired. The file should contain the following variables:
+4. Create a new file that contains the required variables. Make a copy of `settings.env.sample`, e.g. `mysettings.env`, and modify as desired. The file should contain the following variables:
     ```bash
     ORACLE_SID=XE
     ORACLE_PDB=XEPDB1
@@ -35,17 +32,18 @@
     APEX_ADMIN_PWD=Oracle__18
     INSTALL_FILE_APEX=apex_19.1.zip
     INSTALL_FILE_ORDS=ords-18.4.0.354.1002.zip
+    INSTALL_FILE_JAVA=jdk-8u201-linux-x64.tar.gz
     DOCKER_ORDS_PORT=50080
     DOCKER_EM_PORT=55500
     DOCKER_DB_PORT=51521
     DB_VERSION=18.4.0
     DB_EDITION=XE
     ```
-6. Run the second script to build the Oracle Database image, where the environment file is called `mysettings.env`:
+5. Run the first script to grab the latest Docker [images](https://github.com/oracle/docker-images) from Oracle and build the Oracle Database image. The script takes one parameter, the environment filename (`mysettings.env`):
     ```bash
-    $ . 02-build.sh mysettings.env
+    $ . 01-build.sh mysettings.env
     ```
-7. Run the final script to create and run the container, where the container name is `axer` (it is preferred that you execute a command using `sudo` before executing this script):
+6. Run the final script to create and run the container, where the container name is `axer` (it is preferred that you execute a command using `sudo` before executing this script):
     ```bash
     $ . 03-run.sh axer mysettings.env
     ```

03-run.sh 02-run.sh03-run.sh renamed to 02-run.sh

@@ -2,11 +2,18 @@
 
 export APEX_HOME=$ORACLE_BASE/product/apex
 export ORDS_HOME=$ORACLE_BASE/product/ords
+export JAVA_HOME=$ORACLE_BASE/product/java/latest
 export SCRIPT_DIR=$SCRIPTS_ROOT
 export FILES_DIR=/tmp/files
+export PATH=$JAVA_HOME/bin:$PATH
 
-echo "##### Install dependencies #####"
-yum install -y java-1.8.0-openjdk
+echo "##### Install dependencies if required #####"
+if [ ! -d $JAVA_HOME ]; then
+  JAVA_DIR_NAME=`tar -tzf $FILES_DIR/$INSTALL_FILE_JAVA | head -1 | cut -f1 -d"/"`
+  mkdir -p $ORACLE_BASE/product/java
+  tar zxf $FILES_DIR/$INSTALL_FILE_JAVA --directory $ORACLE_BASE/product/java
+  ln -s $ORACLE_BASE/product/java/$JAVA_DIR_NAME $JAVA_HOME
+fi
 
 # Extract files
 echo "##### Extracting files ####"
@@ -28,8 +35,16 @@ esac
 
 # Install APEX
 echo "##### Installing APEX #####"
-runuser oracle -m -s /bin/bash -c ". $SCRIPT_DIR/package/installApex.sh"
+if [ $UID = "0" ]; then
+  runuser oracle -m -s /bin/bash -c ". $SCRIPT_DIR/package/installApex.sh"
+else
+  . $SCRIPT_DIR/package/installApex.sh
+fi
 
 # Install ORDS
 echo "##### Installing ORDS #####"
-runuser oracle -m -s /bin/bash -c ". $SCRIPT_DIR/package/installOrds.sh"
+if [ $UID = "0" ]; then
+  runuser oracle -m -s /bin/bash -c ". $SCRIPT_DIR/package/installOrds.sh"
+else
+  . $SCRIPT_DIR/package/installOrds.sh
+fi

README.md

@@ -2,11 +2,18 @@
 
 export APEX_HOME=$ORACLE_BASE/product/apex
 export ORDS_HOME=$ORACLE_BASE/product/ords
+export JAVA_HOME=$ORACLE_BASE/product/java/latest
 export SCRIPT_DIR=$SCRIPTS_ROOT
 export FILES_DIR=/tmp/files
+export PATH=$JAVA_HOME/bin:$PATH
 
-echo "##### Install dependencies #####"
-yum install -y java-1.8.0-openjdk
+echo "##### Install dependencies if required #####"
+if [ ! -d $JAVA_HOME ]; then
+  JAVA_DIR_NAME=`tar -tzf $FILES_DIR/$INSTALL_FILE_JAVA | head -1 | cut -f1 -d"/"`
+  mkdir -p $ORACLE_BASE/product/java
+  tar zxf $FILES_DIR/$INSTALL_FILE_JAVA --directory $ORACLE_BASE/product/java
+  ln -s $ORACLE_BASE/product/java/$JAVA_DIR_NAME $JAVA_HOME
+fi
 
 # Extract files
 echo "##### Extracting files if required ####"
@@ -26,4 +33,8 @@ fi
 
 # Run ORDS
 echo "##### Starting ORDS #####"
-runuser oracle -m -s /bin/bash -c ". $SCRIPT_DIR/package/runOrds.sh"
+if [ $UID = "0" ]; then
+  runuser oracle -m -s /bin/bash -c ". $SCRIPT_DIR/package/runOrds.sh"
+else
+  . $SCRIPT_DIR/package/runOrds.sh
+fi

scripts/setup/01-install.sh

@@ -0,0 +1,17 @@
+ORACLE_SID=XE
+ORACLE_PDB=XEPDB1
+ORACLE_PWD=Oracle18
+APEX_ADMIN_EMAIL=myemail@domain.com
+APEX_ADMIN_PWD=Oracle__18
+APEX_PUBLIC_USER_PWD=Oracle18_1
+APEX_LISTENER_PWD=Oracle18_2
+APEX_REST_PUBLIC_USER_PWD=Oracle18_3
+ORDS_PUBLIC_USER_PWD=Oracle18_4
+INSTALL_FILE_APEX=apex_19.1.zip
+INSTALL_FILE_ORDS=ords-18.4.0.354.1002.zip
+INSTALL_FILE_JAVA=jdk-8u201-linux-x64.tar.gz
+DOCKER_ORDS_PORT=50080
+DOCKER_EM_PORT=55500
+DOCKER_DB_PORT=51521
+DB_VERSION=18.4.0
+DB_EDITION=xe