Allow RTU builds

Author: fuzziebrain

01-build.sh

@@ -54,12 +54,16 @@ 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
+# RTU_ENABLED default 'N'
+# The following is used for preparing "ready to use" images for internal use only.
+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}
+  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
+fi
 
 echo "##### Building Docker Image for Oracle Database ${DB_VERSION} ${DB_EDITION} #####"
 cd dockerfiles && . buildDockerImage.sh -v ${DB_VERSION} ${DB_EDITION_FLAG}

02-run.sh

@@ -19,25 +19,37 @@ docker network inspect -f {{.Name}} $DOCKER_NETWORK_NAME || \
 echo "##### Removing any previous containers #####"
 docker rm -vf $CONTAINER_NAME
 
-if [ ! -d "${HOST_DATA_DIR}" ]; then
+if [ ! -d "${HOST_DATA_DIR}" ] && ! [[ $RTU_ENABLED =~ ^(Y|y)$ ]]; then
   mkdir $HOST_DATA_DIR
 fi
 
 echo "##### Changing file ownership. May require password to continue. #####"
-sudo -n chown 54321:543321 ${HOST_DATA_DIR} || chmod 777 ${HOST_DATA_DIR}
-
+if ! [[ $RTU_ENABLED =~ ^(Y|y)$ ]]; then
+  sudo -n chown 54321:543321 ${HOST_DATA_DIR} || chmod 777 ${HOST_DATA_DIR}
+fi
+ 
 echo "##### Creating container $CONTAINER_NAME #####"
-docker run -d --name $CONTAINER_NAME \
-        --network ${DOCKER_NETWORK_NAME} \
-        -p ${DOCKER_ORDS_PORT:-50080}:8080 \
-        -p ${DOCKER_EM_PORT:-55500}:5500 \
-        -p ${DOCKER_DB_PORT:-51521}:1521 \
-        --env-file $ENV_FILE \
-        -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 \
-        oracle/database:${DB_VERSION}-${DB_EDITION}
+if [[ $RTU_ENABLED =~ ^(Y|y)$ ]]; then
+  docker run -d --name $CONTAINER_NAME \
+          --network ${DOCKER_NETWORK_NAME} \
+          -p ${DOCKER_ORDS_PORT:-50080}:8080 \
+          -p ${DOCKER_EM_PORT:-55500}:5500 \
+          -p ${DOCKER_DB_PORT:-51521}:1521 \
+          --env-file $ENV_FILE \
+          oracle/database:${DB_VERSION}-${DB_EDITION}
+else
+  docker run -d --name $CONTAINER_NAME \
+          --network ${DOCKER_NETWORK_NAME} \
+          -p ${DOCKER_ORDS_PORT:-50080}:8080 \
+          -p ${DOCKER_EM_PORT:-55500}:5500 \
+          -p ${DOCKER_DB_PORT:-51521}:1521 \
+          --env-file $ENV_FILE \
+          -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 \
+          oracle/database:${DB_VERSION}-${DB_EDITION}
+fi
 
 echo "##### Tailing logs. Ctrl-C to exit. #####"
 docker logs -f $CONTAINER_NAME