Merge pull request #55 from fuzziebrain/feature/issue-39

Feature/issue 39

Author: fuzziebrain

01-build.sh

@@ -10,6 +10,7 @@ DB_EDITION=$(echo ${DB_EDITION:-xe} | tr '[:upper:]' '[:lower:]')
 FILES_DIR=${FILES_DIR:-$BASE_DIR/files}
 ALLOW_DB_PATCHING=${ALLOW_DB_PATCHING:-N}
 OML4R_SUPPORT=${OML4R_SUPPORT:-N}
+XE_DOWNLOAD_BASE_URL="https://download.oracle.com/otn-pub/otn_software/db-express/"
 
 SED_OPTS='-i -r'
 if [[ "$OSTYPE" == "darwin"* ]]; then
@@ -52,15 +53,28 @@ mv tmp/OracleDatabase/SingleInstance/dockerfiles/ .
 rm -rf tmp/
 
 echo "##### Staging RPM #####"
-if [ $DB_VERSION = '21.3.0' ]  && [ ! $DB_EDITION = 'xe' ]; then
-  cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_213000_db_home.zip
-  DOCKER_FILE=Dockerfile
+if [ $DB_VERSION = '21.3.0' ]; then
+  if [ $DB_EDITION = 'xe' ]; then
+    DOCKER_FILE=Dockerfile.$DB_EDITION
+    if [[ $XE_USE_LOCAL_COPY =~ (Y|y) ]]; then
+      cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-database-xe-21c-1.0-1.ol7.x86_64.rpm
+      sed $SED_OPTS "s|${XE_DOWNLOAD_BASE_URL}||g" ${DOCKER_FILE:-Dockerfile}
+      sed $SED_OPTS "s|^(COPY)(.+CHECK_SPACE_FILE.+INSTALL_DIR/)$|\1 \$INSTALL_FILE_1\2|g" ${DOCKER_FILE:-Dockerfile}
+    fi
+  else
+    cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_213000_db_home.zip
+    DOCKER_FILE=Dockerfile
+  fi
 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
-  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
+  if [[ $XE_USE_LOCAL_COPY =~ (Y|y) ]]; then
+    cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/oracle-database-xe-18c-1.0-1.x86_64.rpm
+    sed $SED_OPTS "s|${XE_DOWNLOAD_BASE_URL}||g" ${DOCKER_FILE:-Dockerfile}
+    sed $SED_OPTS "s|^(COPY)(.+CHECK_SPACE_FILE.+INSTALL_DIR/)$|\1 \$INSTALL_FILE_1\2|g" ${DOCKER_FILE:-Dockerfile}
+  fi
 elif [ $DB_VERSION = '18.3.0' ]; then
   cd dockerfiles/$DB_VERSION && curl --progress-bar -O file://$FILES_DIR/LINUX.X64_180000_db_home.zip
   DOCKER_FILE=Dockerfile

quickstart.sh

@@ -70,6 +70,7 @@ REST_ENABLED_SQL=Y
 RTU_ENABLED=N
 SQLDEVWEB=Y
 DATABASEAPI=Y
+XE_USE_LOCAL_COPY=N
 EOF
 
 ##### Download files #####

settings.env.sample

@@ -33,4 +33,5 @@ OML4R_SUPPORT=N
 REST_ENABLED_SQL=Y
 RTU_ENABLED=N
 SQLDEVWEB=Y
-DATABASEAPI=Y
+DATABASEAPI=Y
+XE_USE_LOCAL_COPY=N