Corrige problème fichier hors contexte

This commit is contained in:
2016-10-26 21:36:21 +02:00
parent ebf7d095c9
commit 9e7616d052
2 changed files with 5 additions and 6 deletions

View File

@@ -12,13 +12,13 @@ php:
build: ./php-fpm build: ./php-fpm
expose: expose:
- 9000 - 9000
ports:
- 9042:9042
volumes: volumes:
- ~/Public:/var/www/html - ~/Public:/var/www/html
- ~/log/php:/var/log/ - ~/log/php:/var/log/php
- ~/log/xdebug:/var/log/xdebug
- ./config/php.ini:/usr/local/etc/php/php.ini - ./config/php.ini:/usr/local/etc/php/php.ini
- ./config/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini - ./config/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
- ./config/ssmtpd.conf:/etc/ssmtp/ssmtp.conf
links: links:
- mariadb - mariadb
- mailcatcher - mailcatcher

View File

@@ -7,11 +7,12 @@ RUN cd /tmp/ && \
mv xdebug-2.4.1/* /usr/src/php/ext/xdebug/ mv xdebug-2.4.1/* /usr/src/php/ext/xdebug/
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
ssmtp \ ssmtp \
libfreetype6-dev \ libfreetype6-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libmcrypt-dev \ libmcrypt-dev \
libpng12-dev \ libpng12-dev \
mariadb-client \
&& docker-php-ext-install -j$(nproc) iconv mcrypt gd zip \ && docker-php-ext-install -j$(nproc) iconv mcrypt gd zip \
&& docker-php-ext-install -j$(nproc) mysqli pdo pdo_mysql \ && docker-php-ext-install -j$(nproc) mysqli pdo pdo_mysql \
&& docker-php-ext-install -j$(nproc) xdebug\ && docker-php-ext-install -j$(nproc) xdebug\
@@ -21,6 +22,4 @@ RUN apt-get update && apt-get install -y \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
COPY ../config/ssmtpd.conf /etc/ssmtp/ssmtp.conf
RUN docker-php-ext-install xdebug RUN docker-php-ext-install xdebug