From: ArthurHoaro <arthur@hoa.ro>
Date: Wed, 16 Dec 2020 15:02:14 +0000 (+0100)
Subject: Merge pull request #1658 from dougbreaux/master
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=8f423eb11c6642d96b5144f56e4698652591ad6b;hp=b1d78519a8dd8b43698f76c61d9967ca542a1660

Merge pull request #1658 from dougbreaux/master

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

diff --git a/Dockerfile b/Dockerfile
index f6120b71..79d33130 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 \