Files added to container moved to one directory

This is to save some filesystem layers in the built image.

Author: ryzy

Dockerfile

@@ -11,11 +11,7 @@ RUN \
   easy_install supervisor && \
   mkdir -p /etc/supervisord.d /var/log/supervisor
 
-
-# Bootstrap
-RUN mkdir -p /config/init /config/data /config/temp
-ADD config/ /config/
-
-ADD supervisord.conf /etc/supervisord.conf
+# Add supervisord conf, bootstrap.sh files
+ADD container-files /
 
 CMD ["/config/bootstrap.sh"]

README.md

@@ -49,7 +49,7 @@ This container is configured to run your service(s) both in interactive and non-
 
 ## Author
 
-Author: ryzy (<[email protected]>)  
-Author: pozgo (<[email protected]>)
+Author: Marcin Ryzycki (<[email protected]>)  
+Author: Przemyslaw Ozgo (<[email protected]>)
 
 This work is also inspired by [maxexcloo](https://github.com/maxexcloo)'s work on his [docker images](https://github.com/maxexcloo/Docker). Thanks!

config/bootstrap.sh renamed to container-files/config/bootstrap.sh

@@ -6,7 +6,7 @@ set -e
 # as container might start with /data mounted from another data-container).
 mkdir -p /data/run /data/logs
 
-if [ "$(ls -A /config/init)" ]; then
+if [ "$(ls /config/init/)" ]; then
   for init in /config/init/*.sh; do
     . $init
   done

container-files/config/init/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

supervisord.conf renamed to container-files/etc/supervisord.conf

@@ -6,4 +6,4 @@ logfile = NONE
 loglevel = debug
 
 [include]
-files = /etc/supervisord.d/*.conf
+files = /etc/supervisor.d/*.conf