Merge pull request #1698 from ArthurHoaro/feature/plugins-search-filter

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

diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index d1bf64d571c7b4476798554304fac40293bf73fa..471f239743651420a1afc012c2412b6b9f0b1554 100644 (file)
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,24 +1,24 @@
 # Stage 1:
 # - Copy Shaarli sources
 # - Build documentation
-FROM arm32v6/alpine:3.8 as docs
+FROM arm32v6/alpine:3.10 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
 
 # Stage 2:
 # - Resolve PHP dependencies with Composer
-FROM arm32v6/alpine:3.8 as composer
+FROM arm32v6/alpine:3.10 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
 
 # Stage 3:
 # - Frontend dependencies
-FROM arm32v6/alpine:3.8 as node
+FROM arm32v6/alpine:3.10 as node
 COPY --from=composer /app/shaarli /shaarli
 RUN apk --update --no-cache add yarn nodejs-current python2 build-base \
     && cd /shaarli \
@@ -28,7 +28,7 @@ RUN apk --update --no-cache add yarn nodejs-current python2 build-base \
 
 # Stage 4:
 # - Shaarli image
-FROM arm32v6/alpine:3.8
+FROM arm32v6/alpine:3.10
 LABEL maintainer="Shaarli Community"
 
 RUN apk --update --no-cache add \
@@ -36,6 +36,7 @@ RUN apk --update --no-cache add \
         nginx \
         php7 \
         php7-ctype \
+        php7-curl \
         php7-fpm \
         php7-gd \
         php7-iconv \