Skip to content

Commit 83cafa7

Browse files
committed
Update to 7.1
fixes formapro#5
1 parent 79f409a commit 83cafa7

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

base/Dockerfile

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,32 @@ FROM ubuntu:16.04
22

33
MAINTAINER Maksim Kotliar <kotlyar.maksim@gmail.com>
44

5+
ENV LC_ALL=C.UTF-8
6+
7+
RUN apt-get update && \
8+
apt-get -y --no-install-recommends --no-install-suggests install software-properties-common python-software-properties && \
9+
add-apt-repository ppa:ondrej/php && \
10+
rm -rf /var/lib/apt/lists/*
11+
512
RUN apt-get update && \
6-
apt-get install -y --no-install-recommends --no-install-suggests nginx php php-fpm ca-certificates gettext && \
13+
apt-get remove php7.0 && \
14+
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 && \
715
rm -rf /var/lib/apt/lists/*
816

917

1018
# forward request and error logs to docker log collector
1119
RUN ln -sf /dev/stdout /var/log/nginx/access.log \
1220
&& ln -sf /dev/stderr /var/log/nginx/error.log \
13-
&& ln -sf /dev/stderr /var/log/php7.0-fpm.log
21+
&& ln -sf /dev/stderr /var/log/php7.1-fpm.log
1422

1523
RUN rm -f /etc/nginx/sites-enabled/*
1624

1725
COPY nginx.conf.tpl /tmp/nginx.conf.tpl
1826
COPY php-fpm.conf.tpl /tmp/php-fpm.conf.tpl
19-
COPY defaults.ini /etc/php/7.0/cli/conf.d/defaults.ini
20-
COPY defaults.ini /etc/php/7.0/fpm/conf.d/defaults.ini
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
2129

22-
RUN mkdir -p /run/php && touch /run/php/php7.0-fpm.sock && touch /run/php/php7.0-fpm.pid
30+
RUN mkdir -p /run/php && touch /run/php/php7.1-fpm.sock && touch /run/php/php7.1-fpm.pid
2331

2432
COPY entrypoint.sh /entrypoint.sh
2533
RUN chmod 755 /entrypoint.sh

0 commit comments

Comments
 (0)