Merge pull request #16 from fuzziebrain/fixes-20190618

Updates and fixes

Author: fuzziebrain

scripts/setup/package/setupBaseWallet.sh

@@ -7,11 +7,16 @@ ORACLE_SID=${ORACLE_SID:-XE}
 
 . oraenv 
 
+export WALLET_BASE_PATH=$ORACLE_BASE/oradata/dbconfig/$ORACLE_SID/wallets
 export BUNDLE_FILE=/etc/pki/tls/cert.pem
-export WALLET_PATH=$ORACLE_BASE/admin/$ORACLE_SID/tls_wallet
+export WALLET_PATH=$WALLET_BASE_PATH/tls_wallet
 export WALLET_PWD=$ORACLE_PWD
 export WALLET_PWD_CONFIRM=$WALLET_PWD
 
+if [ ! -d $WALLET_BASE_PATH ]; then
+  mkdir -p $WALLET_BASE_PATH
+fi
+
 sh -c "$(curl -fsSL https://gist.githubusercontent.com/fuzziebrain/202f902d8fc6d8de586da5097a501047/raw/78dba192f4c15f59d14ac17491734897fc440e40/createBaseWallet.sh)"
 
 echo "Setup APEX Wallet"
@@ -32,4 +37,4 @@ sqlplus / as sysdba << EOF
     commit;
   end;
   /
-EOF
+EOF

settings.env.sample

@@ -9,7 +9,7 @@ APEX_REST_PUBLIC_USER_PWD=Oracle18_3
 ORDS_PUBLIC_USER_PWD=Oracle18_4
 INSTALL_FILE_APEX=apex_19.1.zip
 INSTALL_FILE_ORDS=ords-19.1.0.092.1545.zip
-INSTALL_FILE_JAVA=jdk-8u201-linux-x64.tar.gz
+INSTALL_FILE_JAVA=jdk-8u211-linux-x64.tar.gz
 DOCKER_ORDS_PORT=50080
 DOCKER_EM_PORT=55500
 DOCKER_DB_PORT=51521

settings_db19c.env.sample

@@ -9,7 +9,7 @@ APEX_REST_PUBLIC_USER_PWD=Oracle19_3
 ORDS_PUBLIC_USER_PWD=Oracle19_4
 INSTALL_FILE_APEX=apex_19.1.zip
 INSTALL_FILE_ORDS=ords-19.1.0.092.1545.zip
-INSTALL_FILE_JAVA=jdk-8u201-linux-x64.tar.gz
+INSTALL_FILE_JAVA=jdk-8u211-linux-x64.tar.gz
 DOCKER_ORDS_PORT=50080
 DOCKER_EM_PORT=55500
 DOCKER_DB_PORT=51521