Merge pull request wnameless#11 from fbe/improve-buildsetup-and-scripts

Add assets folder and setup.sh & statup.sh

Author: wnameless

Dockerfile

@@ -2,48 +2,11 @@ FROM ubuntu:14.04.1
 
 MAINTAINER Wei-Ming Wu <[email protected]>
 
-ADD chkconfig /sbin/chkconfig
-ADD init.ora /
-ADD initXETemp.ora /
-ADD oracle-xe_11.2.0-1.0_amd64.debaa /
-ADD oracle-xe_11.2.0-1.0_amd64.debab /
-ADD oracle-xe_11.2.0-1.0_amd64.debac /
-# ADD oracle-xe_11.2.0-1.0_amd64.deb /
-RUN cat /oracle-xe_11.2.0-1.0_amd64.deba* > /oracle-xe_11.2.0-1.0_amd64.deb
-
-# Install sshd
-RUN apt-get install -y openssh-server
-RUN mkdir /var/run/sshd
-RUN echo 'root:admin' | chpasswd
-RUN sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
-RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
-RUN echo "export VISIBLE=now" >> /etc/profile
-
-# Prepare to install Oracle
-RUN apt-get install -y libaio1 net-tools bc
-RUN ln -s /usr/bin/awk /bin/awk
-RUN mkdir /var/lock/subsys
-RUN chmod 755 /sbin/chkconfig
-
-# Install Oracle
-RUN dpkg --install /oracle-xe_11.2.0-1.0_amd64.deb
-
-RUN mv /init.ora /u01/app/oracle/product/11.2.0/xe/config/scripts
-RUN mv /initXETemp.ora /u01/app/oracle/product/11.2.0/xe/config/scripts
-
-RUN printf 8080\\n1521\\noracle\\noracle\\ny\\n | /etc/init.d/oracle-xe configure
-
-RUN echo 'export ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe' >> /etc/bash.bashrc
-RUN echo 'export PATH=$ORACLE_HOME/bin:$PATH' >> /etc/bash.bashrc
-RUN echo 'export ORACLE_SID=XE' >> /etc/bash.bashrc
-
-# Remove installation files
-RUN rm /oracle-xe_11.2.0-1.0_amd64.deb*
+ADD assets /assets
+RUN /assets/setup.sh
 
 EXPOSE 22
 EXPOSE 1521
 EXPOSE 8080
 
-CMD sed -i -E "s/HOST = [^)]+/HOST = $HOSTNAME/g" /u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora; \
-	service oracle-xe start; \
-	/usr/sbin/sshd -D
+CMD /usr/sbin/startup.sh && /usr/sbin/sshd -D

chkconfig renamed to assets/chkconfig

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# avoid dpkg frontend dialog / frontend warnings 
+export DEBIAN_FRONTEND=noninteractive
+
+cat /assets/oracle-xe_11.2.0-1.0_amd64.deba* > /assets/oracle-xe_11.2.0-1.0_amd64.deb
+
+# Install OpenSSH
+apt-get install -y openssh-server &&
+mkdir /var/run/sshd &&
+echo 'root:admin' | chpasswd &&
+sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config &&
+sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd &&
+echo "export VISIBLE=now" >> /etc/profile &&
+
+# Prepare to install Oracle
+apt-get install -y libaio1 net-tools bc &&
+ln -s /usr/bin/awk /bin/awk &&
+mkdir /var/lock/subsys &&
+mv /assets/chkconfig /sbin/chkconfig &&
+chmod 755 /sbin/chkconfig &&
+
+# Install Oracle
+dpkg --install /assets/oracle-xe_11.2.0-1.0_amd64.deb &&
+
+# Backup listener.ora as template
+cp /u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora /u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora.tmpl &&
+
+mv /assets/init.ora /u01/app/oracle/product/11.2.0/xe/config/scripts &&
+mv /assets/initXETemp.ora /u01/app/oracle/product/11.2.0/xe/config/scripts &&
+
+printf 8080\\n1521\\noracle\\noracle\\ny\\n | /etc/init.d/oracle-xe configure &&
+
+echo 'export ORACLE_HOME=/u01/app/oracle/product/11.2.0/xe' >> /etc/bash.bashrc &&
+echo 'export PATH=$ORACLE_HOME/bin:$PATH' >> /etc/bash.bashrc &&
+echo 'export ORACLE_SID=XE' >> /etc/bash.bashrc &&
+
+# Install startup script for container
+mv /assets/startup.sh /usr/sbin/startup.sh &&
+chmod +x /usr/sbin/startup.sh &&
+
+# Remove installation files
+rm -r /assets/
+
+
+exit $?

init.ora renamed to assets/init.ora

@@ -0,0 +1,8 @@
+#!/bin/bash
+LISTENERS_ORA=/u01/app/oracle/product/11.2.0/xe/network/admin/listener.ora
+
+cp "${LISTENERS_ORA}.tmpl" "$LISTENERS_ORA" && 
+sed -i "s/%hostname%/$HOSTNAME/g" "${LISTENERS_ORA}" && 
+sed -i "s/%port%/1521/g" "${LISTENERS_ORA}" && 
+
+service oracle-xe start