aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAgurato <mail.vmonot@gmail.com>2019-06-02 12:52:07 +0200
committerAgurato <mail.vmonot@gmail.com>2019-06-02 12:52:07 +0200
commite14d47cc55bdceb4c5ecd43ddf2cdcfa6dadc87b (patch)
tree6d98121b19b4a58f7c61cd161693a9e8e7245ff7
parent86aa2486541660a78ab3e347ba12e25aae232b7c (diff)
downloadShaarli-e14d47cc55bdceb4c5ecd43ddf2cdcfa6dadc87b.tar.gz
Shaarli-e14d47cc55bdceb4c5ecd43ddf2cdcfa6dadc87b.tar.zst
Shaarli-e14d47cc55bdceb4c5ecd43ddf2cdcfa6dadc87b.zip
Fix armhf Dockerfile
-rw-r--r--Dockerfile.armhf5
1 files changed, 2 insertions, 3 deletions
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 1185e2df..d1bf64d5 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -3,7 +3,7 @@
3# - Build documentation 3# - Build documentation
4FROM arm32v6/alpine:3.8 as docs 4FROM arm32v6/alpine:3.8 as docs
5ADD . /usr/src/app/shaarli 5ADD . /usr/src/app/shaarli
6RUN apk --update --no-cache add py2-pip \ 6RUN apk --update --no-cache add py2-pip \
7 && cd /usr/src/app/shaarli \ 7 && cd /usr/src/app/shaarli \
8 && pip install --no-cache-dir mkdocs \ 8 && pip install --no-cache-dir mkdocs \
9 && mkdocs build --clean 9 && mkdocs build --clean
@@ -12,7 +12,7 @@ RUN apk --update --no-cache add py2-pip \
12# - Resolve PHP dependencies with Composer 12# - Resolve PHP dependencies with Composer
13FROM arm32v6/alpine:3.8 as composer 13FROM arm32v6/alpine:3.8 as composer
14COPY --from=docs /usr/src/app/shaarli /app/shaarli 14COPY --from=docs /usr/src/app/shaarli /app/shaarli
15RUN apk --update --no-cache add php7-mbstring composer \ 15RUN apk --update --no-cache add php7-curl php7-mbstring composer \
16 && cd /app/shaarli \ 16 && cd /app/shaarli \
17 && composer --prefer-dist --no-dev install 17 && composer --prefer-dist --no-dev install
18 18
@@ -36,7 +36,6 @@ RUN apk --update --no-cache add \
36 nginx \ 36 nginx \
37 php7 \ 37 php7 \
38 php7-ctype \ 38 php7-ctype \
39 php7-curl \
40 php7-fpm \ 39 php7-fpm \
41 php7-gd \ 40 php7-gd \
42 php7-iconv \ 41 php7-iconv \