Merge pull request #61 from docker/180802

enhance supervisord config
docker · Sep 4, 2018 · e8aa221 · e8aa221
2 parents 078fb61 + f67e6c1
commit e8aa221
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,7 @@ ENV TOMCAT_MAJOR=9 \
 ##shib-idp \
     VERSION=3.3.3 \
 ##TIER \
-    TIERVERSION=180801 \
+    TIERVERSION=180802 \
 ################## \
 ### OTHER VARS ### \
 ################## \
@@ -163,8 +163,8 @@ ADD container_files/system/startup.sh /usr/bin/
 ADD container_files/bin/setenv.sh /opt/tier/setenv.sh
 ADD container_files/bin/setupcron.sh /usr/bin/setupcron.sh
 ADD container_files/bin/sendtierbeacon.sh /usr/bin/sendtierbeacon.sh
-ADD container_files/system/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-RUN chmod +x /opt/tier/setenv.sh \
+ADD container_files/system/supervisord.conf /etc/supervisor/supervisord.conf
+RUN mkdir -p /etc/supervisor/conf.d && chmod +x /opt/tier/setenv.sh \
     && chmod +x /usr/bin/setupcron.sh \
     && chmod +x /usr/bin/startup.sh \
     && chmod +x /usr/bin/sendtierbeacon.sh \

diff --git a/container_files/system/startup.sh b/container_files/system/startup.sh
@@ -53,4 +53,4 @@ sed -i -e '/<rollingPolicy/,/<\/rollingPolicy>/d' ${IDP_LOG_CFG_FILE}
 
 
 #launch supervisord
-/usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
+/usr/bin/supervisord -c /etc/supervisor/supervisord.conf
diff --git a/container_files/system/supervisord.conf b/container_files/system/supervisord.conf
@@ -23,3 +23,6 @@ stdout_logfile=/tmp/logtomcat
 stdout_logfile_maxbytes=0
 stderr_logfile=/tmp/logtomcat
 stderr_logfile_maxbytes=0
+
+[include]
+files=/etc/supervisor/conf.d/*