Merge pull request #44 from drupal-docker/issue/43

Issue #43: Common prefix for .ini files

Author: zaporylie

5.4/Dockerfile

@@ -14,4 +14,4 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo
   && echo "export PATH=~/.composer/vendor/bin:\$PATH" >> ~/.bash_profile \
   && rm -rf /var/lib/apt/lists/*
 
-COPY drupal.ini /usr/local/etc/php/conf.d/
+COPY drupal-*.ini /usr/local/etc/php/conf.d/

5.4/apache/Dockerfile

@@ -11,4 +11,4 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
 	&& a2enmod rewrite \
 	&& rm -rf /var/lib/apt/lists/*
 
-COPY drupal.ini /usr/local/etc/php/conf.d/
+COPY drupal-*.ini /usr/local/etc/php/conf.d/

5.4/apache/drupal.ini 5.4/apache/drupal-00.ini5.4/apache/drupal.ini renamed to 5.4/apache/drupal-00.ini

@@ -10,4 +10,4 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
   && docker-php-ext-enable redis \
 	&& rm -rf /var/lib/apt/lists/*
 
-COPY drupal.ini /usr/local/etc/php/conf.d/
+COPY drupal-*.ini /usr/local/etc/php/conf.d/

5.4/drupal.ini 5.4/drupal-00.ini5.4/drupal.ini renamed to 5.4/drupal-00.ini

@@ -15,4 +15,4 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo
   && echo "export PATH=~/.composer/vendor/bin:\$PATH" >> ~/.bash_profile \
   && rm -rf /var/lib/apt/lists/*
 
-COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/
+COPY drupal-*.ini /usr/local/etc/php/conf.d/

5.4/fpm/Dockerfile

@@ -12,4 +12,4 @@ RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
 	&& a2enmod rewrite \
 	&& rm -rf /var/lib/apt/lists/*
 
-COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/
+COPY drupal-*.ini /usr/local/etc/php/conf.d/