Skip to content

Commit c17985b

Browse files
committed
Merge branch 'release/0.7.0'
2 parents 5af6a5d + e7d7656 commit c17985b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM php:7.3.8-fpm-alpine3.10
1+
FROM php:7.4.2-fpm-alpine3.11
22

33
ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
44
PHP_OPCACHE_MAX_ACCELERATED_FILES="10000" \
@@ -10,6 +10,7 @@ RUN apk info \
1010
&& echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
1111
&& echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \
1212
&& echo @3.9 http://dl-cdn.alpinelinux.org/alpine/v3.9/main >> /etc/apk/repositories \
13+
&& echo @3.10 http://dl-cdn.alpinelinux.org/alpine/v3.10/main >> /etc/apk/repositories \
1314
&& apk update \
1415
&& apk upgrade \
1516
&& apk add --no-cache --virtual .build-deps \
@@ -39,7 +40,7 @@ RUN apk info \
3940
xvfb \
4041
chromium@3.9 \
4142
chromium-chromedriver@3.9 \
42-
&& docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-png-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
43+
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
4344
&& docker-php-ext-install -j$(nproc) \
4445
gd \
4546
pdo_mysql \
@@ -49,7 +50,6 @@ RUN apk info \
4950
intl \
5051
opcache \
5152
pcntl \
52-
mbstring \
5353
iconv \
5454
&& pecl install \
5555
redis \

0 commit comments

Comments
 (0)