From 05189f2125027b0da1c6ceca531b2d236ed402a1 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Mon, 24 Jul 2017 08:32:07 +0100 Subject: [PATCH 1/2] curl version of imagemagick --- Dockerfile | 10 +++++----- README.md | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1fe7616..3a52237 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,9 +6,6 @@ ARG BUILD_DATE ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -# package versions -ARG IMAGEMAGICK_VER="6.9.9-0" - # install build packages RUN \ apk add --no-cache --virtual=build-dependencies \ @@ -46,11 +43,14 @@ RUN \ zlib && \ # compile imagemagic + IMAGEMAGICK_VER=$(curl --silent http://www.imagemagick.org/download/digest.rdf \ + | grep ImageMagick-6.*tar.gz | sed 's/\(.*\).tar.*/\1/' \ + | sed 's/^.*ImageMagick-/ImageMagick-/') && \ mkdir -p \ /tmp/imagemagick && \ curl -o \ - /tmp/imagemagick-src.tar.xz -L \ - "http://www.imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VER}.tar.xz" && \ + /tmp/imagemagick-src.tar.gz -L \ + "http://www.imagemagick.org/download/${IMAGEMAGICK_VER}.tar.gz" && \ tar xf \ /tmp/imagemagick-src.tar.xz -C \ /tmp/imagemagick --strip-components=1 && \ diff --git a/README.md b/README.md index cc073b5..0d35f9c 100644 --- a/README.md +++ b/README.md @@ -98,4 +98,5 @@ To reverse proxy with our Letsencrypt docker container use the following locatio ## Versions -+ **17.07.17:** Initial release ++ **24.07.17:** Curl version for imagemagick. ++ **17.07.17:** Initial release. From 995ef7f2146a0cfdedacaa5173b8f6b4915033ee Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Mon, 24 Jul 2017 08:38:59 +0100 Subject: [PATCH 2/2] correct xz instead of gz in imagemgick curl --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3a52237..267657a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,13 +44,13 @@ RUN \ # compile imagemagic IMAGEMAGICK_VER=$(curl --silent http://www.imagemagick.org/download/digest.rdf \ - | grep ImageMagick-6.*tar.gz | sed 's/\(.*\).tar.*/\1/' \ + | grep ImageMagick-6.*tar.xz | sed 's/\(.*\).tar.*/\1/' \ | sed 's/^.*ImageMagick-/ImageMagick-/') && \ mkdir -p \ /tmp/imagemagick && \ curl -o \ - /tmp/imagemagick-src.tar.gz -L \ - "http://www.imagemagick.org/download/${IMAGEMAGICK_VER}.tar.gz" && \ + /tmp/imagemagick-src.tar.xz -L \ + "http://www.imagemagick.org/download/${IMAGEMAGICK_VER}.tar.xz" && \ tar xf \ /tmp/imagemagick-src.tar.xz -C \ /tmp/imagemagick --strip-components=1 && \