Fix php5 version, reorganize repo to not rely on branch.

Author: jmeyo

Dockerfile renamed to Dockerfile.php5

@@ -1,4 +1,4 @@
-FROM houseofagile/docker-nginx-php-fpm:php7
+FROM houseofagile/docker-nginx-php-fpm:php5
 
 MAINTAINER Meillaud Jean-Christophe ([email protected])
 
@@ -17,12 +17,14 @@ ADD ./config/ssh-keys /root/ssh-keys
 
 ADD ./config/sm-config /root/.symfony-manager/sm-config
 ADD .bowerrc /root/.bowerrc
+ADD ./default-symfony-nginx.conf /root/docker-config/default-symfony-nginx.conf
 
 RUN chown www-data -R /usr/share/nginx/ && \
 mkdir -p /root/docker-config && \
 rm /etc/nginx/sites-enabled/default && \
-mkdir -p /etc/my_init.d
-ADD ./default-symfony-nginx.conf /root/docker-config/default-symfony-nginx.conf
+mkdir -p /etc/my_init.d && \
+sed -i 's#%%php_fpm_sock_file%%#/var/run/php/php5.6-fpm.sock#g' /root/docker-config/default-symfony-nginx.conf
+
 
 ADD setup-projects.sh /etc/my_init.d/10_setup-projects.sh
 RUN chmod +x /etc/my_init.d/10_setup-projects.sh

Dockerfile.php7

@@ -0,0 +1,32 @@
+FROM houseofagile/docker-nginx-php-fpm:php7
+
+MAINTAINER Meillaud Jean-Christophe ([email protected])
+
+#Node install
+RUN apt-get update \
+ && apt-get install -y nodejs npm \
+ && npm install less -g && npm install -g bower \
+ && curl -sS https://getcomposer.org/installer | php -- --version=1.3.2 --install-dir=/usr/bin/ \
+ && mv /usr/bin/composer.phar /usr/bin/composer \
+ && mkdir /root/projects && mkdir /root/ssh-keys \
+ && echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config \
+ && apt-get clean && rm -rf /tmp/* /var/tmp/*
+
+ADD ./config/projects /root/projects
+ADD ./config/ssh-keys /root/ssh-keys
+
+ADD ./config/sm-config /root/.symfony-manager/sm-config
+ADD .bowerrc /root/.bowerrc
+ADD ./default-symfony-nginx.conf /root/docker-config/default-symfony-nginx.conf
+
+RUN chown www-data -R /usr/share/nginx/ && \
+  mkdir -p /root/docker-config && \
+  rm /etc/nginx/sites-enabled/default && \
+  mkdir -p /etc/my_init.d && \
+  sed -i 's#%%php_fpm_sock_file%%#/run/php/php7.0-fpm.sock#g' /root/docker-config/default-symfony-nginx.conf
+
+ADD setup-projects.sh /etc/my_init.d/10_setup-projects.sh
+RUN chmod +x /etc/my_init.d/10_setup-projects.sh
+
+EXPOSE 80
+CMD ["/sbin/my_init"]

default-symfony-nginx.conf

@@ -36,7 +36,7 @@ server {
                 fastcgi_param PATH_INFO $fastcgi_path_info;
                 fastcgi_param SERVER_NAME $host;
                 if ($uri !~ "^/uploads/") {
-                    fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
+                    fastcgi_pass unix:%%php_fpm_sock_file%%;
                 }
         }