Fixed issue with mounted data

Author: MaksymBilenko

Dockerfile

@@ -16,7 +16,7 @@ chmod 755 /sbin/chkconfig &&\
 
 EXPOSE 1521
 EXPOSE 8080
-VOLUME ["/u01/app/oracle/oradata"]
+VOLUME ["/u01/app/oracle"]
 
 ADD entrypoint.sh /
 ENTRYPOINT ["/entrypoint.sh"]

README.md

@@ -15,7 +15,7 @@ Run with 8080 and 1521 ports opened:
 
 Run with data on host and reuse it:
 
-    docker run -d -p 8080:8080 -p 1521:1521 -v /my/oracle/data:/u01/app/oracle/oradata sath89/oracle-xe-11g
+    docker run -d -p 8080:8080 -p 1521:1521 -v /my/oracle/data:/u01/app/oracle sath89/oracle-xe-11g
 
 Connect database with following setting:
 
@@ -37,11 +37,12 @@ Connect to Oracle Application Express web management console with following sett
     password: oracle
 
 **CHANGELOG**
-* Fixed issue with ownership of mounted data folders.
-* Fixed issue with Gracefull shutdown of service.
-* Reduse size of image from 3.8G to 825Mb.
-* Database initialization moved out of the image build phase. Now database initializes at the containeer startup with no database files mounted.
-* Added database media reuse support outside of container.
-* Added graceful shutdown on containeer stop.
-* Removed sshd.
+* Fixed issue with reusable mounted data
+* Fixed issue with ownership of mounted data folders
+* Fixed issue with Gracefull shutdown of service
+* Reduse size of image from 3.8G to 825Mb
+* Database initialization moved out of the image build phase. Now database initializes at the containeer startup with no database files mounted
+* Added database media reuse support outside of container
+* Added graceful shutdown on containeer stop
+* Removed sshd
 

entrypoint.sh

@@ -2,8 +2,11 @@
 
 # Prevent owner issues on mounted folders
 chown -R oracle:dba /u01/app/oracle
+rm -f /u01/app/oracle/product
+ln -s /u01/app/oracle-product /u01/app/oracle/product
 # Update hostname
 sed -i -E "s/HOST = [^)]+/HOST = $HOSTNAME/g" /u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora
+sed -i -E "s/PORT = [^)]+/PORT = 1521/g" /u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora
 echo "export ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe" > /etc/profile.d/oracle-xe.sh
 echo "export PATH=\$ORACLE_HOME/bin:\$PATH" >> /etc/profile.d/oracle-xe.sh
 echo "export ORACLE_SID=XE" >> /etc/profile.d/oracle-xe.sh
@@ -14,8 +17,16 @@ case "$1" in
 		#Check for mounted database files
 		if [ "$(ls -A /u01/app/oracle/oradata)" ]; then
 			echo "found files in /u01/app/oracle/oradata Using them instead of initial database"
+			echo "XE:$ORACLE_HOME:N" >> /etc/oratab
+			chown oracle:dba /etc/oratab
+			chown 664 /etc/oratab
+			printf "ORACLE_DBENABLED=false\nLISTENER_PORT=1521\nHTTP_PORT=8080\nCONFIGURE_RUN=true\n" > /etc/default/oracle-xe
+			rm -rf /u01/app/oracle-product/11.2.0/xe/dbs
+			ln -s /u01/app/oracle/dbs /u01/app/oracle-product/11.2.0/xe/dbs
 		else
 			echo "Database not initialized. Initializing database."
+			mv /u01/app/oracle-product/11.2.0/xe/dbs /u01/app/oracle/dbs
+			ln -s /u01/app/oracle/dbs /u01/app/oracle-product/11.2.0/xe/dbs
 			printf 8080\\n1521\\noracle\\noracle\\ny\\n | /etc/init.d/oracle-xe configure
 			echo "Database initialized. Please visit http://#containeer:8080/apex to proceed with configuration"
 		fi

oracle-install.sh

@@ -9,4 +9,6 @@ rm -f /oracle-xe_11.2.0-1.0_amd64.deb*
 mv /init.ora /u01/app/oracle/product/11.2.0/xe/config/scripts
 mv /initXETemp.ora /u01/app/oracle/product/11.2.0/xe/config/scripts
 
+mv /u01/app/oracle/product /u01/app/oracle-product
+
 apt-get clean && rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/*