Resolve issues #10 and #11

Author: fuzziebrain

.gitignore

@@ -86,8 +86,10 @@ $RECYCLE.BIN/
 *.rpm
 *.tar
 *.gz
+*.swp
 tmp
 dockerfiles
 oradata
+*-oradata
 *.env
 *.bak

02-run.sh

@@ -8,28 +8,29 @@ ENV_FILE=${2:-.env}
 BASE_DIR=$(pwd -P)
 DB_VERSION=${DB_VERSION:-18.4.0}
 DB_EDITION=$(echo ${DB_EDITION:-xe} | tr '[:upper:]' '[:lower:]')
+HOST_DATA_DIR=${CONTAINER_NAME}-oradata
 
 echo "##### Removing any previous containers #####"
 docker rm -vf $CONTAINER_NAME
 
-if [ ! -d "oradata" ]; then
-  mkdir oradata
+if [ ! -d "${HOST_DATA_DIR}" ]; then
+  mkdir $HOST_DATA_DIR
 fi
 
 echo "##### Changing file ownership. May require password to continue. #####"
-sudo chown 54321:54321 oradata
+sudo chown 54321:543321 ${HOST_DATA_DIR} || chmod 777 ${HOST_DATA_DIR}
 
 echo "##### Creating container $CONTAINER_NAME #####"
 docker run -d --name $CONTAINER_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/oradata:/opt/oracle/oradata \
+        -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}
 
 echo "##### Tailing logs. Ctrl-C to exit. #####"
-docker logs -f $CONTAINER_NAME
+docker logs -f $CONTAINER_NAME

README.md

@@ -48,10 +48,6 @@
     $ . 02-run.sh axer mysettings.env
     ```
 
-    > **IMPORTANT**
-    >
-    > The second script requires `sudo` rights. If your user does not have this privilege, comment out `sudo chown 54321:54321 oradata` and replace it with `chmod 777 oradata`.
-
 Using the sample settings, the following are accessible:
 
 | Port | Application | URL |