Fix missing change in Dockerfile-dev

ezpublishlegacy · Aug 31, 2015 · c0bdff2 · c0bdff2
1 parent a36d761
commit c0bdff2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/dockerfiles/ezphp/Dockerfile b/dockerfiles/ezphp/Dockerfile
@@ -15,7 +15,9 @@ ENV DEBIAN_FRONTEND=noninteractive \
     PORT=9000 \
     COMPOSER_HOME=/var/.composer
 
-RUN apt-get update -q -y && apt-get install -q -y --force-yes --no-install-recommends \
+## Get packages
+RUN apt-get update -q -y \
+ && apt-get install -q -y --force-yes --no-install-recommends \
     php5-cli \
     php5-readline \
     php5-fpm \
@@ -60,6 +62,7 @@ RUN sed -i "s@^;daemonize = yes*@daemonize = no@" /etc/php5/fpm/php-fpm.conf
 # Set listen socket for php-fpm
 RUN sed -i "s@^listen = /var/run/php5-fpm.sock@listen = $PORT@" /etc/php5/fpm/pool.d/www.conf
 
+# Get Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin && mv /usr/local/bin/composer.phar /usr/local/bin/composer
 
 # As application is put in as volume we do all needed operation on run

diff --git a/dockerfiles/ezphp/Dockerfile-dev b/dockerfiles/ezphp/Dockerfile-dev
@@ -15,7 +15,9 @@ ENV DEBIAN_FRONTEND=noninteractive \
     PORT=9000 \
     COMPOSER_HOME=/var/.composer
 
-RUN apt-get update -q -y && apt-get install -q -y --force-yes --no-install-recommends \
+## Get packages
+RUN apt-get update -q -y \
+ && apt-get install -q -y --force-yes --no-install-recommends \
     php5-cli \
     php5-readline \
     php5-fpm \
@@ -67,12 +69,12 @@ RUN sed -i "s@^;daemonize = yes*@daemonize = no@" /etc/php5/fpm/php-fpm.conf
 # Set listen socket for php-fpm
 RUN sed -i "s@^listen = /var/run/php5-fpm.sock@listen = $PORT@" /etc/php5/fpm/pool.d/www.conf
 
+# Get Composer
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin && mv /usr/local/bin/composer.phar /usr/local/bin/composer
 
 # As application is put in as volume we do all needed operation on run
 ADD run.sh /run.sh
 ADD generate_kickstart_file.sh /generate_kickstart_file.sh
-ADD kickstart_template.ini /kickstart_template.ini
 ADD generate_parameters_file.sh /generate_parameters_file.sh
 ADD prepare_distribution_volume.sh /prepare_distribution_volume.sh
 ADD config/opcache.ini /etc/php5/mods-available/opcache.ini