From 88331ed4ab157809bbc1a465e00f0e8f37f52b81 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Wed, 29 Mar 2017 22:46:46 +0100 Subject: [PATCH 1/2] use edge repository for php dependencies --- Dockerfile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c6329a6..9efd672 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,20 +16,27 @@ RUN \ gcc \ imagemagick-dev \ libtool \ - make \ + make && \ + apk add --no-cache \ + --repository http://nl.alpinelinux.org/alpine/edge/community \ php7-dev && \ # install runtime packages + apk add --no-cache \ + --repository http://nl.alpinelinux.org/alpine/edge/main \ + libwebp && \ apk add --no-cache \ imagemagick \ mc \ + re2c && \ + apk add --no-cache \ + --repository http://nl.alpinelinux.org/alpine/edge/community \ php7-curl \ php7-exif \ php7-gd \ php7-mbstring \ php7-mysqlnd \ - php7-zip \ - re2c && \ + php7-zip && \ # install lychee mkdir -p \ From 21be5093aa6755c11e6b6aac45a8ae7f61038beb Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Wed, 29 Mar 2017 23:02:27 +0100 Subject: [PATCH 2/2] shellcheck fix --- root/etc/cont-init.d/40-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/40-config b/root/etc/cont-init.d/40-config index a7eeefa..cfd1d7c 100644 --- a/root/etc/cont-init.d/40-config +++ b/root/etc/cont-init.d/40-config @@ -7,7 +7,7 @@ mkdir -p \ for image_index in {big,import,medium,thumb}; do if [ ! -f /pictures/${image_index}/index.html ]; then mkdir -p /pictures/${image_index} -> /pictures/${image_index}/index.html +: > /pictures/${image_index}/index.html fi done