diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index bd0cb89..924f752 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -78,7 +78,7 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache - - name: Testing Debian Stretch Image + name: Testing Debian Buster Image run: | docker run --rm -v $(pwd):/imgs im-buster -resize 500 /imgs/test.jpg /imgs/test-resize.jpg docker run --rm -v $(pwd):/imgs im-buster -resize 500 /imgs/test.jpg webp:/imgs/test-jpg.webp @@ -88,3 +88,6 @@ jobs: docker run --rm -v $(pwd):/imgs im-buster -resize 100 /imgs/test.png avif:/imgs/test-png.avif docker run --rm -v $(pwd):/imgs im-buster /imgs/test.pdf /imgs/test-pdf.png docker run --rm -v $(pwd):/imgs im-buster /imgs/jpg-with-metadata.jpg /imgs/jpg-with-metadata.webp + docker run --rm -v $(pwd):/imgs im-buster -resize 200 /imgs/test.tiff /imgs/test-resize.tiff + docker run --rm -v $(pwd):/imgs im-buster -resize 200 /imgs/test.tiff webp:/imgs/test-tiff.webp + docker run --rm -v $(pwd):/imgs im-buster -resize 200 /imgs/test.tiff avif:/imgs/test-tiff.avif \ No newline at end of file diff --git a/Dockerfile.buster b/Dockerfile.buster index 8aefde4..9ffb10b 100644 --- a/Dockerfile.buster +++ b/Dockerfile.buster @@ -1,8 +1,8 @@ FROM debian:buster-slim -ARG IM_VERSION=7.0.11-6 -ARG LIB_HEIF_VERSION=1.11.0 -ARG LIB_AOM_VERSION=3.0.0 +ARG IM_VERSION=7.0.11-10 +ARG LIB_HEIF_VERSION=1.12.0 +ARG LIB_AOM_VERSION=3.1.0 ARG LIB_WEBP_VERSION=1.2.0 RUN apt-get -y update && \ @@ -13,7 +13,7 @@ RUN apt-get -y update && \ # libheif libde265-0 libde265-dev libjpeg62-turbo libjpeg62-turbo-dev x265 libx265-dev libtool \ # IM - libpng16-16 libpng-dev libjpeg62-turbo libjpeg62-turbo-dev libgomp1 ghostscript libxml2-dev libxml2-utils && \ + libpng16-16 libpng-dev libjpeg62-turbo libjpeg62-turbo-dev libgomp1 ghostscript libxml2-dev libxml2-utils libtiff-dev && \ # Building libwebp git clone https://chromium.googlesource.com/webm/libwebp && \ cd libwebp && git checkout v${LIB_WEBP_VERSION} && \ @@ -39,10 +39,10 @@ RUN apt-get -y update && \ # Building ImageMagick git clone https://github.com/ImageMagick/ImageMagick.git && \ cd ImageMagick && git checkout ${IM_VERSION} && \ - ./configure --without-magick-plus-plus --disable-docs --disable-static && \ + ./configure --without-magick-plus-plus --disable-docs --disable-static --with-libtiff && \ make && make install && \ ldconfig /usr/local/lib && \ - apt-get remove --autoremove --purge -y gcc make cmake curl g++ yasm git autoconf pkg-config libpng-dev libjpeg62-turbo-dev libde265-dev libx265-dev libxml2-dev && \ + apt-get remove --autoremove --purge -y gcc make cmake curl g++ yasm git autoconf pkg-config libpng-dev libjpeg62-turbo-dev libde265-dev libx265-dev libxml2-dev libtiff-dev && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /ImageMagick diff --git a/README.md b/README.md index 92cdaeb..5c4b342 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,13 @@ $ docker run --entrypoint=identify -v /your/images:/imgs dpokidov/imagemagick /i ## Base images -There are three base images: Fedora:27, Debian Buster (stable) and Debian Stretch (oldstable). By default Debian Buster is used. +There are three base images: Fedora:27, Debian Buster (stable) and Debian Stretch (oldstable). By default, Debian Buster is used. Use tags to switch between base images. Not all images support the same features. Below is a table of known formats supported by different base images: -| Base Image | Jpeg | PNG | JpegXR | WebP | AVIF | PDF | -| ---------- | :---: | :---: | :------: | :----: | :----: | :---: | -| fedora27 | X | X | X | X | | X | -| stretch | X | X | | X | | X | -| buster | X | X | | X | X | X | +| Base Image | Jpeg | PNG | JpegXR | WebP | AVIF | PDF | TIFF | +| ---------- | :---: | :---: | :------: | :----: | :----: | :---: | :--: | +| fedora27 | X | X | X | X | | X | | +| stretch | X | X | | X | | X | | +| buster | X | X | | X | X | X | X | diff --git a/test.tiff b/test.tiff new file mode 100644 index 0000000..a79cae6 Binary files /dev/null and b/test.tiff differ