Merge tag 'v0.12.1' into latest

[github/shaarli/Shaarli.git] / Dockerfile.armhf

diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index d1bf64d571c7b4476798554304fac40293bf73fa..5bbf668049d7ed31f203d799b29f64685d538e43 100644 (file)
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -3,7 +3,7 @@
 # - Build documentation
 FROM arm32v6/alpine:3.8 as docs
 ADD . /usr/src/app/shaarli
-RUN apk --update --no-cache add py2-pip  \
+RUN apk --update --no-cache add py2-pip \
     && cd /usr/src/app/shaarli \
     && pip install --no-cache-dir mkdocs \
     && mkdocs build --clean
@@ -12,7 +12,7 @@ RUN apk --update --no-cache add py2-pip  \
 # - Resolve PHP dependencies with Composer
 FROM arm32v6/alpine:3.8 as composer
 COPY --from=docs /usr/src/app/shaarli /app/shaarli
-RUN apk --update --no-cache add php7-curl php7-mbstring composer \
+RUN apk --update --no-cache add php7-curl php7-mbstring php7-simplexml composer \
     && cd /app/shaarli \
     && composer --prefer-dist --no-dev install
 
@@ -36,6 +36,7 @@ RUN apk --update --no-cache add \
         nginx \
         php7 \
         php7-ctype \
+        php7-curl \
         php7-fpm \
         php7-gd \
         php7-iconv \