Commit 396cccb6 authored by Thomas Citharel's avatar Thomas Citharel 🏃🏻
Browse files

Merge branch 'henricook-develop-patch-98816' into 'develop'

Dockerfile issue: Downgrade PHP and Composer to workaround bugs

See merge request !464
parents 8ee1c0f4 558aca14
FROM php:apache
FROM php:7-apache
MAINTAINER kyane@kyane.fr
......@@ -7,7 +7,7 @@ RUN docker-php-ext-install intl && docker-php-ext-install pdo_mysql
RUN a2enmod rewrite
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
COPY --from=composer:1.10 /usr/bin/composer /usr/bin/composer
COPY docker/stretch/php.ini /usr/local/etc/php/php.ini
COPY docker/stretch/apache-framadate.conf /etc/apache2/sites-enabled/framadate.conf
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment