newer alpine (for newer PHP) and apk upgrade #1655
This commit is contained in:
parent
e4b8330e45
commit
495545f2f0
1 changed files with 3 additions and 2 deletions
|
@ -26,7 +26,7 @@ RUN cd shaarli \
|
||||||
|
|
||||||
# Stage 4:
|
# Stage 4:
|
||||||
# - Shaarli image
|
# - Shaarli image
|
||||||
FROM alpine:3.8
|
FROM alpine:3.12
|
||||||
LABEL maintainer="Shaarli Community"
|
LABEL maintainer="Shaarli Community"
|
||||||
|
|
||||||
RUN apk --update --no-cache add \
|
RUN apk --update --no-cache add \
|
||||||
|
@ -46,7 +46,8 @@ RUN apk --update --no-cache add \
|
||||||
php7-xml \
|
php7-xml \
|
||||||
php7-simplexml \
|
php7-simplexml \
|
||||||
php7-zlib \
|
php7-zlib \
|
||||||
s6
|
s6 \
|
||||||
|
&& apk -U upgrade
|
||||||
|
|
||||||
COPY .docker/nginx.conf /etc/nginx/nginx.conf
|
COPY .docker/nginx.conf /etc/nginx/nginx.conf
|
||||||
COPY .docker/php-fpm.conf /etc/php7/php-fpm.conf
|
COPY .docker/php-fpm.conf /etc/php7/php-fpm.conf
|
||||||
|
|
Loading…
Reference in a new issue