Cleanup supervisor environment.

build/Dockerfile

@@ -24,6 +24,7 @@ MAINTAINER Uni Mock <[email protected]> version: 0.0
 # Let the container know that there is no tty
 ENV DEBIAN_FRONTEND noninteractive
 
+# --- set timezone
 ARG BUILD_TZ="Europe/Berlin"
 RUN echo "$BUILD_TZ" > /etc/timezone && \
     dpkg-reconfigure -f noninteractive tzdata
@@ -52,7 +53,6 @@ RUN dpkg-reconfigure dash
 # --- 7 Synchronize the System Clock
 RUN apt-get -y install ntp ntpdate
 
-RUN echo "kann wieder raus"
 
 # --- 8 Install Postfix, Dovecot, MySQL, phpMyAdmin, rkhunter, binutils
 ARG BUILD_MYSQL_PW="pass"
@@ -194,27 +194,28 @@ RUN mkdir -p /usr/local/bin
 COPY ./bin/*             /usr/local/bin/
 RUN chmod a+x /usr/local/bin/*
 
+
 #
 # establisch supervisord
 #
 ADD /supervisor /etc/supervisor
 # link old /etc/init.d/ startup scripts to supervisor
-RUN ls -m1    /etc/supervisor/services.d | while read i; do ln -sf /etc/supervisor/super-init.sh /etc/init.d/$i ; done
+RUN ls -m1    /etc/supervisor/services.d | while read i; do mv /etc/init.d/$i /etc/init.d/$i-orig ;  ln -sf /etc/supervisor/super-init.sh /etc/init.d/$i ; done
 RUN ln -sf    /etc/supervisor/systemctl /bin/systemctl
 RUN chmod a+x /etc/supervisor/* /etc/supervisor/*.d/*
-
+copy /supervisor/invoke-rc.d /usr/sbin/invoke-rc.d 
 #
 # create directory for service volume
 #
 RUN mkdir -p /service ; chmod a+rwx /service
-ADD .track.gitignore /.gitignore
+ADD track.gitignore /.gitignore
 
 #
 # Create bootstrap archives
 #
 RUN mkdir -p /bootstrap ;  tar -C /var/vmail -czf /bootstrap/vmail.tgz .
 RUN mkdir -p /bootstrap ;  tar -C /var/www   -czf /bootstrap/www.tgz  .
-
+ENV TERM xterm
 #
 # startup script
 #

build/supervisor/init.d/postfix

@@ -1,9 +1,9 @@
 #!/bin/bash
+cd /var/spool/postfix
 
 echo " - calling newaliases" 
 newaliases
 
-cd /var/spool/postfix
 echo " - appling hosts, localtime, resolv.conf from /etc to /var/spool/postfix/etc"
 FILES="etc/localtime etc/services etc/resolv.conf etc/hosts \
       etc/nsswitch.conf etc/nss_mdns.config"
@@ -13,4 +13,12 @@ for file in $FILES; do
      if [ -f  ${file} ]; then chmod a+rX ${file}; fi
 done
 
+echo " - creating /etc/mailname with <$(hostname -f)>"
+echo $(hostname -f) > /etc/mailname
 
+
+list=`cd /etc/postfix && ls *.db`
+for i in $list ; do
+   echo " - running postmap for </etc/postfix/${i%.db}>"
+   postmap /etc/postfix/${i%.db}
+done

build/supervisor/invoke-rc.d

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/etc/init.d/${1} ${2}

build/supervisor/super-init.sh

@@ -4,7 +4,11 @@ SVC=`basename $0`
 
 if [ "$1" = "reload" ] ; then
   /usr/bin/supervisorctl stop  ${SVC}
+  test -x /etc/supervisor/init.d/${SVC} && /etc/supervisor/init.d/${SVC} 
   /usr/bin/supervisorctl start ${SVC}
+elif [ "$1" = "start" ] ; then
+  test -x /etc/supervisor/init.d/${SVC} && /etc/supervisor/init.d/${SVC} 
+  /usr/bin/supervisorctl $1 ${SVC}
 else
   /usr/bin/supervisorctl $1 ${SVC}
 fi

build/supervisor/systemctl

@@ -2,12 +2,5 @@
 
 SVC=${2%.service}
 
-case "$1" in
-        restart | stop | status | start )
+/etc/init.d/${SVC} ${1}
 
-                /usr/bin/supervisorctl ${1} ${SVC}
-        ;;
-        *)
-                echo "error: unkown command: $@"
-        exit 1
-esac