Fix pre-18.2 support

Author: fuzziebrain

.gitignore

@@ -86,4 +86,6 @@ $RECYCLE.BIN/
 *.rpm
 tmp
 dockerfiles
-oradata
+oradata
+^sample.env
+*.env

02-build.sh

@@ -4,7 +4,7 @@ ENV_FILE=${1:-.env}
 
 . $ENV_FILE
 
-BASE_DIR=$(readlink -f $0 | xargs dirname)
+BASE_DIR=$(readlink -f -- "$0" | xargs dirname)
 DB_VERSION=${DB_VERSION:-18.4.0}
 DB_EDITION=${DB_EDITION:-XE}
 
@@ -24,4 +24,4 @@ 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 #####"
+echo "##### Done #####"

sample.env

@@ -3,10 +3,14 @@ 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_18.2.zip
 INSTALL_FILE_ORDS=ords-18.4.0.354.1002.zip
 DOCKER_ORDS_PORT=50080
 DOCKER_EM_PORT=55500
 DOCKER_DB_PORT=51521
 DB_VERSION=18.4.0
-DB_EDITION=XE
+DB_EDITION=XE

scripts/setup/01-install.sh

@@ -15,6 +15,17 @@ unzip -q $FILES_DIR/$INSTALL_FILE_APEX -d $ORACLE_BASE/product
 unzip -q $FILES_DIR/$INSTALL_FILE_ORDS -d $ORDS_HOME
 chown -R oracle:oinstall $APEX_HOME $ORDS_HOME
 
+# Set apex_rest_config prefix if required
+APEX_VERSION=$(echo $INSTALL_FILE_APEX | sed -r 's/^apex_(.+)\.zip$/\1/')
+case "$APEX_VERSION" in
+4.*|5.*|18.1)
+  # DO NOT add prefix for apex_rest_config
+  ;;
+*)
+  export PREFIX=@
+  ;;
+esac
+
 # Install APEX
 echo "##### Installing APEX #####"
 runuser oracle -m -s /bin/bash -c ". $SCRIPT_DIR/package/installApex.sh"

scripts/setup/package/installApex.sh

@@ -17,10 +17,10 @@ sqlplus / as sysdba << EOF
   @apexins.sql SYSAUX SYSAUX TEMP /i/
 
   -- APEX REST configuration
-  @apex_rest_config_core.sql @ ${ORACLE_PWD} ${ORACLE_PWD}
+  @apex_rest_config_core.sql $PREFIX "${APEX_LISTENER_PWD:-$ORACLE_PWD}" "${APEX_REST_PUBLIC_USER_PWD:-$ORACLE_PWD}"
 
   -- Required for ORDS install
-  alter user apex_public_user identified by ${ORACLE_PWD} account unlock;
+  alter user apex_public_user identified by "${APEX_PUBLIC_USER_PWD:-$ORACLE_PWD}" account unlock;
 
   -- Network ACL
   prompt Setup Network ACL

scripts/setup/package/installOrds.sh

@@ -15,7 +15,7 @@ cd $ORDS_HOME
 
 cat << EOF > $ORDS_HOME/params/custom_params.properties
 db.hostname=localhost
-db.password=${ORACLE_PWD}
+db.password=${APEX_PUBLIC_USER_PWD:-$ORACLE_PWD}
 db.port=1521
 db.servicename=${ORACLE_PDB:-XEPDB1}
 db.username=APEX_PUBLIC_USER
@@ -24,9 +24,9 @@ rest.services.apex.add=true
 rest.services.ords.add=true
 schema.tablespace.default=SYSAUX
 schema.tablespace.temp=TEMP
-user.apex.listener.password=${ORACLE_PWD}
-user.apex.restpublic.password=${ORACLE_PWD}
-user.public.password=${ORACLE_PWD}
+user.apex.listener.password=${APEX_LISTENER_PWD:-$ORACLE_PWD}
+user.apex.restpublic.password=${APEX_REST_PUBLIC_USER_PWD:-$ORACLE_PWD}
+user.public.password=${ORDS_PUBLIC_USER_PWD:-$ORACLE_PWD}
 user.tablespace.default=SYSAUX
 user.tablespace.temp=TEMP
 sys.user=sys