Merge tag 'v0.12.1' into latest

[github/shaarli/Shaarli.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index d8921cee4cae2820a1448635f6ad1dab6425fe0b..f6120b71f2b1d4507cd46dcaf7ebf09934d98139 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
 
@@ -16,7 +17,7 @@ RUN cd shaarli \
 
 # Stage 3:
 # - Frontend dependencies
-FROM node:9.9-alpine as node
+FROM node:12-alpine as node
 COPY --from=composer /app/shaarli shaarli
 RUN cd shaarli \
     && yarn install \
@@ -43,6 +44,7 @@ RUN apk --update --no-cache add \
         php7-openssl \
         php7-session \
         php7-xml \
+        php7-simplexml \
         php7-zlib \
         s6