From e14d47cc55bdceb4c5ecd43ddf2cdcfa6dadc87b Mon Sep 17 00:00:00 2001 From: Agurato Date: Sun, 2 Jun 2019 12:52:07 +0200 Subject: [PATCH 1/3] Fix armhf Dockerfile --- Dockerfile.armhf | 5 ++--- 1 file 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 @@ # - 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-mbstring composer \ +RUN apk --update --no-cache add php7-curl php7-mbstring composer \ && cd /app/shaarli \ && composer --prefer-dist --no-dev install @@ -36,7 +36,6 @@ RUN apk --update --no-cache add \ nginx \ php7 \ php7-ctype \ - php7-curl \ php7-fpm \ php7-gd \ php7-iconv \ From 0b0694064cfaa262b29d12a5b31fcee23b792934 Mon Sep 17 00:00:00 2001 From: Agurato Date: Sun, 2 Jun 2019 12:57:33 +0200 Subject: [PATCH 2/3] Fix armhf Dockerfile --- Dockerfile.armhf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index d1bf64d5..c7eefc13 100644 --- 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 From a47656a28ed87f784329761643417a9509b5e788 Mon Sep 17 00:00:00 2001 From: Agurato Date: Tue, 4 Jun 2019 19:52:22 +0200 Subject: [PATCH 3/3] Rollback on removing php7-curl from step 4 --- Dockerfile.armhf | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.armhf b/Dockerfile.armhf index c7eefc13..b75663bb 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -36,6 +36,7 @@ RUN apk --update --no-cache add \ nginx \ php7 \ php7-ctype \ + php7-curl \ php7-fpm \ php7-gd \ php7-iconv \