Merge pull request #1 from ufuchs/master

ORACLE env not available if someone execs a command against the container

Author: MaksymBilenko

.gitignore

@@ -1 +1,4 @@
 .DS_Store
+*.*~
+*~
+

CHANGELOG

@@ -0,0 +1,15 @@
+[Dockerfile]
+switched to Ubuntu 14.04.02
+prefer 'curl' to 'wget' to have a progress bar
+inserted ORA env # see issue 1
+set 'apt-get' quieter
+enable 'noninteractive' for 'apt-get'
+
+[oracle-install.sh]
+progress bar on download of orcale installer
+merge the download into a function
+
+[entrypoint.sh]
+removed ORA env
+
+

Dockerfile

@@ -1,19 +1,29 @@
-FROM ubuntu:14.04.1
+FROM ubuntu:14.04.2
 
 MAINTAINER Maksym Bilenko <[email protected]>
 
+# get rid of the message: "debconf: unable to initialize frontend: Dialog"
+ENV DEBIAN_FRONTEND noninteractive
+
 ADD chkconfig /sbin/chkconfig
 ADD oracle-install.sh /oracle-install.sh
 ADD init.ora /
 ADD initXETemp.ora /
 
 # Prepare to install Oracle
-RUN apt-get update && apt-get install -y libaio1 net-tools bc wget && apt-get clean && rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/* &&\
+RUN apt-get update && apt-get install -y -q libaio1 net-tools bc curl && \
+apt-get clean && \
+rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/* &&\
 ln -s /usr/bin/awk /bin/awk &&\
 mkdir /var/lock/subsys &&\
 chmod 755 /sbin/chkconfig &&\
 /oracle-install.sh
 
+# see issue #1
+ENV ORACLE_HOME /u01/app/oracle/product/11.2.0/xe
+ENV PATH $ORACLE_HOME/bin:$PATH
+ENV ORACLE_SID=XE
+
 EXPOSE 1521
 EXPOSE 8080
 VOLUME ["/u01/app/oracle"]
@@ -23,4 +33,4 @@ ENV sessions 555
 ENV transactions 610
 
 ADD entrypoint.sh /
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]

entrypoint.sh

@@ -7,10 +7,6 @@ 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
-. /etc/profile
 
 case "$1" in
 	'')

oracle-install.sh

@@ -1,14 +1,42 @@
 #!/bin/bash
-wget -q 'https://github.com/MaksymBilenko/docker-oracle-xe-11g/blob/master/oracle-xe_11.2.0-1.0_amd64.debaa?raw=true' -O /oracle-xe_11.2.0-1.0_amd64.debaa
-wget -q 'https://github.com/MaksymBilenko/docker-oracle-xe-11g/blob/master/oracle-xe_11.2.0-1.0_amd64.debab?raw=true' -O /oracle-xe_11.2.0-1.0_amd64.debab
-wget -q 'https://github.com/MaksymBilenko/docker-oracle-xe-11g/blob/master/oracle-xe_11.2.0-1.0_amd64.debac?raw=true' -O /oracle-xe_11.2.0-1.0_amd64.debac
-cat /oracle-xe_11.2.0-1.0_amd64.deba* > /oracle-xe_11.2.0-1.0_amd64.deb
-dpkg --install /oracle-xe_11.2.0-1.0_amd64.deb
-rm -f /oracle-xe_11.2.0-1.0_amd64.deb* 
-
-mv /init.ora /u01/app/oracle/product/11.2.0/xe/config/scripts
+
+ORA_DEB="oracle-xe_11.2.0-1.0_amd64.deb"
+
+#
+# download the Oracle installer
+#
+downloadOracle () {
+
+	local url="https://github.com/MaksymBilenko/docker-oracle-xe-11g"
+
+	local ora_deb_partial=( 
+		${ORA_DEB}aa 
+		${ORA_DEB}ab 
+		${ORA_DEB}ac
+	)
+
+	local i=1
+	for part in "${ora_deb_partial[@]}"; do     
+		echo "[Downloading '$part' (part $i/3)]"
+		curl  -# -o /$part -L $url/blob/master/$part?raw=true
+		i=$((i + 1))
+
+	done
+
+	cat /${ORA_DEB}a* > /${ORA_DEB}
+
+	rm -f /${ORA_DEB}a*
+
+}
+
+downloadOracle
+
+dpkg --install /${ORA_DEB}
+rm -f /${ORA_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/*
+apt-get clean && rm -rf /tmp/* /var/lib/apt/lists/* /var/tmp/*