Add WORKDIR on all templates

marmelab · Jun 9, 2014 · afa76fc · afa76fc
1 parent 13de1e3
commit afa76fc
Showing 20 changed files with 39 additions and 1 deletion.
diff --git a/container/container.go b/container/container.go
@@ -294,7 +294,7 @@ func (c *Container) GetFirstMountedDir() string {
 		return volume
 	}
 
-	return ""
+	return "/"
 }
 
 func (c *Container) DependsOf(otherComponentType string) bool {

diff --git a/templates/ambassador/Dockerfile b/templates/ambassador/Dockerfile
@@ -3,6 +3,8 @@ FROM stackbrew/debian:wheezy
 
 [[ updateApt ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 RUN apt-get install -y -f socat
 
 CMD env | grep _TCP= | sed 's/.*_PORT_\([0-9]*\)_TCP=tcp:\/\/\(.*\):\(.*\)/socat TCP4-LISTEN:\1,fork,reuseaddr TCP4:\2:\3 \&/' | sh \

diff --git a/templates/apache/Dockerfile b/templates/apache/Dockerfile
@@ -6,6 +6,8 @@ RUN echo "deb-src http://ftp.fr.debian.org/debian/ wheezy non-free" >> /etc/apt/
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 RUN apt-get install -y -f apache2-mpm-worker libapache2-mod-fastcgi
 RUN a2enmod actions fastcgi alias
 

diff --git a/templates/cassandra/Dockerfile b/templates/cassandra/Dockerfile
@@ -3,6 +3,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 RUN echo "deb http://www.apache.org/dist/cassandra/debian 11x main" > /etc/apt/sources.list.d/cassandra.list
 RUN echo "deb-src http://www.apache.org/dist/cassandra/debian 11x main" >> /etc/apt/sources.list.d/cassandra.list
 

diff --git a/templates/golang/Dockerfile b/templates/golang/Dockerfile
@@ -3,6 +3,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 [[ $version := (.Container.GetCustomValue "version" "1.2") ]]
 
 # Install go

diff --git a/templates/graphite/Dockerfile b/templates/graphite/Dockerfile
@@ -4,6 +4,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 RUN apt-get -y --force-yes install vim  nginx  python-flup expect git memcached sqlite3 libcairo2 libcairo2-dev python-cairo pkg-config build-essential python-dev libsqlite3-dev
 
 RUN wget -P /opt http://python-distribute.org/distribute_setup.py

diff --git a/templates/hhvm/Dockerfile b/templates/hhvm/Dockerfile
@@ -3,6 +3,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 # Update apt to install HHVM
 RUN echo deb http://dl.hhvm.com/debian wheezy main | tee /etc/apt/sources.list.d/hhvm.list
 

diff --git a/templates/jackrabbit/Dockerfile b/templates/jackrabbit/Dockerfile
@@ -3,6 +3,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 # Install Java 7
 RUN aptitude install -y -f openjdk-7-jre
 

diff --git a/templates/mysql/Dockerfile b/templates/mysql/Dockerfile
@@ -3,6 +3,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 # Install mysql
 RUN apt-get -y --force-yes install mysql-server
 

diff --git a/templates/nginx/Dockerfile b/templates/nginx/Dockerfile
@@ -3,6 +3,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 RUN apt-get install -y -f nginx
 
 RUN echo "daemon off;" >> /etc/nginx/nginx.conf

diff --git a/templates/nodejs/Dockerfile b/templates/nodejs/Dockerfile
@@ -3,6 +3,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 [[ installNodeJS ]]
 
 # Install modules

diff --git a/templates/php-fpm/Dockerfile b/templates/php-fpm/Dockerfile
@@ -3,6 +3,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 # Install PHP FPM
 RUN apt-get -y -f install php5-fpm php5-cli php5-mysql php5-mcrypt php5-curl curl
 

diff --git a/templates/php/Dockerfile b/templates/php/Dockerfile
@@ -3,6 +3,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 # Install PHP 5.4
 RUN apt-get -y -f install php5 php5-mysql php5-mcrypt php5-curl curl
 

diff --git a/templates/phpmyadmin/Dockerfile b/templates/phpmyadmin/Dockerfile
@@ -3,6 +3,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 RUN export DEBIAN_FRONTEND=noninteractive
 RUN dpkg --configure -a
 RUN apt-get install -y -f debconf-utils

diff --git a/templates/python/Dockerfile b/templates/python/Dockerfile
@@ -3,6 +3,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 [[ installPython ]]
 
 # Add custom setup script

diff --git a/templates/rabbitmq/Dockerfile b/templates/rabbitmq/Dockerfile
@@ -4,6 +4,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 # Install RabbitMQ
 RUN echo "deb http://www.rabbitmq.com/debian/ testing main" > /etc/apt/sources.list.d/rabbitmq.list
 RUN wget -O - http://www.rabbitmq.com/rabbitmq-signing-key-public.asc | apt-key add -

diff --git a/templates/ror/Dockerfile b/templates/ror/Dockerfile
@@ -3,6 +3,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 [[ $version := (.Container.GetCustomValue "version" "2.1.2") ]]
 [[ $serverType := (.Container.GetCustomValue "serverType" "standalone") ]]
 

diff --git a/templates/ruby/Dockerfile b/templates/ruby/Dockerfile
@@ -3,6 +3,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 [[ installRvm ]]
 
 # Install custom gems

diff --git a/templates/statsd/Dockerfile b/templates/statsd/Dockerfile
@@ -4,6 +4,8 @@ FROM stackbrew/debian:wheezy
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 # Install nodejs
 [[ .Container.SetCustomValue "nodeVersion" "0.10.20"]]
 [[ installNodeJS ]]

diff --git a/templates/varnish/Dockerfile b/templates/varnish/Dockerfile
@@ -6,6 +6,8 @@ RUN echo "deb-src http://ftp.fr.debian.org/debian/ wheezy non-free" >> /etc/apt/
 [[ updateApt ]]
 [[ addUserFiles ]]
 
+WORKDIR [[ .Container.GetFirstMountedDir ]]
+
 RUN curl http://repo.varnish-cache.org/debian/GPG-key.txt | apt-key add -
 RUN echo "deb http://repo.varnish-cache.org/debian/ wheezy varnish-3.0" >> /etc/apt/sources.list
 RUN apt-get update