diff --git a/docker-compose.yml b/docker-compose.yml index 50d9763..1d61f22 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,13 +12,13 @@ php: build: ./php-fpm expose: - 9000 - ports: - - 9042:9042 volumes: - ~/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/xdebug.ini:/usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini + - ./config/ssmtpd.conf:/etc/ssmtp/ssmtp.conf links: - mariadb - mailcatcher diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index c133995..db041e6 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -7,11 +7,12 @@ RUN cd /tmp/ && \ mv xdebug-2.4.1/* /usr/src/php/ext/xdebug/ RUN apt-get update && apt-get install -y \ - ssmtp \ + ssmtp \ libfreetype6-dev \ libjpeg62-turbo-dev \ libmcrypt-dev \ libpng12-dev \ + mariadb-client \ && 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) xdebug\ @@ -21,6 +22,4 @@ RUN apt-get update && apt-get install -y \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY ../config/ssmtpd.conf /etc/ssmtp/ssmtp.conf - RUN docker-php-ext-install xdebug