From: Doug Breaux <25640850+dougbreaux@users.noreply.github.com>
Date: Fri, 4 Dec 2020 22:12:39 +0000 (-0600)
Subject: newer alpine (for newer PHP) and apk upgrade #1655
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=495545f2f07f00ead911908d8bee9a572889eced

newer alpine (for newer PHP) and apk upgrade #1655
---

diff --git a/Dockerfile b/Dockerfile
index f6120b71..bedc9496 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@ RUN cd shaarli \
 
 # Stage 4:
 # - Shaarli image
-FROM alpine:3.8
+FROM alpine:3.12
 LABEL maintainer="Shaarli Community"
 
 RUN apk --update --no-cache add \
@@ -46,7 +46,8 @@ RUN apk --update --no-cache add \
         php7-xml \
         php7-simplexml \
         php7-zlib \
-        s6
+        s6 \
+	&& apk -U upgrade
 
 COPY .docker/nginx.conf /etc/nginx/nginx.conf
 COPY .docker/php-fpm.conf /etc/php7/php-fpm.conf