Skip to content

Commit 2b87474

Browse files
committed
upd php7.2
1 parent 9c6f50c commit 2b87474

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

base/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ RUN apt-get update && \
1212

1313
RUN apt-get update && \
1414
apt-get remove php7.0 && \
15-
apt-get install -y --no-install-recommends --no-install-suggests nginx php7.1 php7.1-fpm php7.1-cli php7.1-common ca-certificates gettext && \
15+
apt-get install -y --no-install-recommends --no-install-suggests nginx php7.2 php7.2-fpm php7.2-cli php7.2-common ca-certificates gettext && \
1616
rm -rf /var/lib/apt/lists/*
1717

1818
# forward request and error logs to docker log collector
1919
RUN ln -sf /dev/stdout /var/log/nginx/access.log \
2020
&& ln -sf /dev/stderr /var/log/nginx/error.log \
21-
&& ln -sf /dev/stderr /var/log/php7.1-fpm.log
21+
&& ln -sf /dev/stderr /var/log/php7.2-fpm.log
2222

2323
RUN rm -f /etc/nginx/sites-enabled/*
2424

2525
COPY nginx.conf.tpl /tmp/nginx.conf.tpl
2626
COPY php-fpm.conf.tpl /tmp/php-fpm.conf.tpl
27-
COPY defaults.ini /etc/php/7.1/cli/conf.d/defaults.ini
28-
COPY defaults.ini /etc/php/7.1/fpm/conf.d/defaults.ini
27+
COPY defaults.ini /etc/php/7.2/cli/conf.d/defaults.ini
28+
COPY defaults.ini /etc/php/7.2/fpm/conf.d/defaults.ini
2929

30-
RUN mkdir -p /run/php && touch /run/php/php7.1-fpm.sock && touch /run/php/php7.1-fpm.pid
30+
RUN mkdir -p /run/php && touch /run/php/php7.2-fpm.sock && touch /run/php/php7.2-fpm.pid
3131

3232
COPY entrypoint.sh /entrypoint.sh
3333
RUN chmod 755 /entrypoint.sh

php-all-exts/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ RUN apt-get update && \
55
apt-get install -y --no-install-recommends --no-install-suggests \
66
php-mongodb php-curl php-intl php-soap php-xml php-mcrypt php-bcmath \
77
php-mysql php-amqp php-gearman php-mbstring php-ldap php-zip php-gd php-xdebug php-imagick && \
8-
rm -f /etc/php/7.1/cli/conf.d/*xdebug.ini && \
9-
rm -f /etc/php/7.1/fpm/conf.d/*xdebug.ini && \
8+
rm -f /etc/php/7.2/cli/conf.d/*xdebug.ini && \
9+
rm -f /etc/php/7.2/fpm/conf.d/*xdebug.ini && \
1010
rm -rf /var/lib/apt/lists/*

0 commit comments

Comments
 (0)