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

[github/shaarli/Shaarli.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index f05cf3a45ccbdb360bcb29adf370f88d46b1043c..bedc9496cfa8345f0a55015f786d761b671bf0ce 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@
 FROM python:3-alpine as docs
 ADD . /usr/src/app/shaarli
 RUN cd /usr/src/app/shaarli \
+    && apk add --no-cache gcc musl-dev \
     && pip install --no-cache-dir mkdocs \
     && mkdocs build --clean
 
@@ -25,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 \
@@ -43,8 +44,10 @@ RUN apk --update --no-cache add \
         php7-openssl \
         php7-session \
         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