Merge branch 'xdebug' of git://github.com/that0n3guy/nginx-php-fpm

This commit is contained in:
Ric Harvey
2017-08-18 14:19:54 +01:00
4 changed files with 44 additions and 1 deletions

View File

@@ -58,6 +58,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
&& addgroup -S nginx \
&& adduser -D -S -h /var/cache/nginx -s /sbin/nologin -G nginx nginx \
&& apk add --no-cache --virtual .build-deps \
autoconf \
gcc \
libc-dev \
make \
@@ -149,6 +150,8 @@ RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repo
openssl-dev \
ca-certificates \
dialog \
autoconf \
make \
gcc \
musl-dev \
linux-headers \
@@ -168,6 +171,7 @@ RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repo
--with-jpeg-dir=/usr/include/ && \
#curl iconv session
docker-php-ext-install pdo_mysql pdo_sqlite mysqli mcrypt gd exif intl xsl json soap dom zip opcache && \
pecl install xdebug && \
docker-php-source delete && \
mkdir -p /etc/nginx && \
mkdir -p /var/www/app && \
@@ -181,7 +185,7 @@ RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repo
pip install -U pip && \
pip install -U certbot && \
mkdir -p /etc/letsencrypt/webrootauth && \
apk del gcc musl-dev linux-headers libffi-dev augeas-dev python-dev
apk del gcc musl-dev linux-headers libffi-dev augeas-dev python-dev make autoconf
# ln -s /usr/bin/php7 /usr/bin/php
ADD conf/supervisord.conf /etc/supervisord.conf