Fixes for RTU and allow custom files location

Author: fuzziebrain

01-build.sh

@@ -7,6 +7,12 @@ ENV_FILE=${1:-.env}
 BASE_DIR=$(pwd -P)
 DB_VERSION=${DB_VERSION:-18.4.0}
 DB_EDITION=$(echo ${DB_EDITION:-xe} | tr '[:upper:]' '[:lower:]')
+FILES_DIR=${FILES_DIR:-$BASE_DIR/files}
+
+SED_OPTS='-i -r'
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  SED_OPTS='-i .bak -E'
+fi
 
 case "$DB_EDITION" in
   "ee")
@@ -33,20 +39,20 @@ rm -rf tmp/
 
 echo "##### Staging RPM #####"
 if [ $DB_VERSION = '19.3.0' ]; then
-  cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$BASE_DIR/files/LINUX.X64_193000_db_home.zip
+  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://$BASE_DIR/files/oracle-database-xe-18c-1.0-1.x86_64.rpm
+  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://$BASE_DIR/files/LINUX.X64_180000_db_home.zip
+  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://$BASE_DIR/files/linuxx64_12201_database.zip
+  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://$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
+  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
 else
   echo "Unknown or unsupported database version and/or edition."
@@ -56,12 +62,12 @@ cd $BASE_DIR
 
 # RTU_ENABLED default 'N'
 # The following is used for preparing "ready to use" images for internal use only.
-if [[ $RTU_ENABLED =~ $(Y|y) ]]; then
+if [[ $RTU_ENABLED =~ (Y|y) ]]; then
   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}
+  REPLACEMENT_STRING=$'COPY scripts/setup/ \$ORACLE_BASE/scripts/setup/\\\nCOPY scripts/startup/ \$ORACLE_BASE/scripts/startup/\\\nCOPY files/ /tmp/files/\\\n'
+  sed $SED_OPTS "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 $FILES_DIR/$INSTALL_FILE_APEX $FILES_DIR/$INSTALL_FILE_ORDS $FILES_DIR/$INSTALL_FILE_JAVA dockerfiles/${DB_VERSION}/files/
   cp -R scripts dockerfiles/${DB_VERSION}/scripts
 fi
 

02-run.sh

@@ -10,6 +10,7 @@ DB_VERSION=${DB_VERSION:-18.4.0}
 DB_EDITION=$(echo ${DB_EDITION:-xe} | tr '[:upper:]' '[:lower:]')
 HOST_DATA_DIR=${CONTAINER_NAME}-oradata
 DOCKER_NETWORK_NAME=${DOCKER_NETWORK_NAME:-bridge}
+FILES_DIR=${FILES_DIR:-$BASE_DIR/files}
 
 echo "##### Check if Docker network $DOCKER_NETWORK_NAME #####"
 docker network inspect -f {{.Name}} $DOCKER_NETWORK_NAME || \
@@ -47,7 +48,7 @@ else
           -v $PWD/$HOST_DATA_DIR:/opt/oracle/oradata \
           -v $PWD/scripts/setup:/opt/oracle/scripts/setup \
           -v $PWD/scripts/startup:/opt/oracle/scripts/startup \
-          -v $PWD/files:/tmp/files \
+          -v $FILES_DIR:/tmp/files \
           oracle/database:${DB_VERSION}-${DB_EDITION}
 fi