From 495545f2f07f00ead911908d8bee9a572889eced Mon Sep 17 00:00:00 2001
From: Doug Breaux <25640850+dougbreaux@users.noreply.github.com>
Date: Fri, 4 Dec 2020 16:12:39 -0600
Subject: [PATCH 1/2] newer alpine (for newer PHP) and apk upgrade #1655

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

From 2a20e67f760fb0587c8ea5c8219ec4546dde55bd Mon Sep 17 00:00:00 2001
From: Doug Breaux <25640850+dougbreaux@users.noreply.github.com>
Date: Sun, 6 Dec 2020 22:02:34 -0600
Subject: [PATCH 2/2] remove apk upgrade #1655

---
 Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bedc9496..79d33130 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,8 +46,7 @@ RUN apk --update --no-cache add \
         php7-xml \
         php7-simplexml \
         php7-zlib \
-        s6 \
-	&& apk -U upgrade
+        s6
 
 COPY .docker/nginx.conf /etc/nginx/nginx.conf
 COPY .docker/php-fpm.conf /etc/php7/php-fpm.conf