From 8872ea1df364d1f946377337dca14f36e9d1c854 Mon Sep 17 00:00:00 2001 From: Googol Lee Date: Fri, 23 May 2025 11:27:07 +0200 Subject: [PATCH] Include MagicWand library in the `dependency` image. (#1209) * Include MagicWand library. * Remove duplication. * Limit dynamic libraries in the release build. * Use cp -a instead of -r. * Use bash instead of sh. --- Dockerfile | 2 +- dependencies/build_imagemagick.sh | 15 +++++++++++---- dependencies/build_libheif.sh | 4 ++-- dependencies/build_libraw.sh | 4 ++-- dependencies/output.sh | 4 ++-- dependencies/prepare.sh | 4 ++-- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index cc78e83c..87525a57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -115,7 +115,7 @@ RUN --mount=type=bind,from=api,source=/dependencies/,target=/dependencies/ \ && /app/scripts/install_runtime_dependencies.sh \ # Install self-building libs && cd /dependencies \ - && cp -a lib/* /usr/local/lib/ \ + && cp -a lib/*.so* /usr/local/lib/ \ && cp -a bin/* /usr/local/bin/ \ && cp -a etc/* /usr/local/etc/ \ && ldconfig \ diff --git a/dependencies/build_imagemagick.sh b/dependencies/build_imagemagick.sh index 27f5c3ef..7eefa209 100755 --- a/dependencies/build_imagemagick.sh +++ b/dependencies/build_imagemagick.sh @@ -1,5 +1,5 @@ -#!/bin/sh -set -eu +#!/bin/bash +set -euo pipefail : ${DEB_HOST_MULTIARCH=`uname -m`-linux-gnu} : ${DEB_HOST_ARCH=`dpkg --print-architecture`} @@ -18,7 +18,14 @@ make make install cd .. -mkdir -p /output/bin /output/etc +mkdir -p /output/bin /output/etc /output/lib /output/include /output/pkgconfig cp /usr/local/bin/magick /output/bin/ -cp -r /usr/local/etc/ImageMagick-7 /output/etc/ImageMagick-7 +cp -a /usr/local/etc/ImageMagick-7 /output/etc/ +cp -a /usr/local/lib/ImageMagick-* /output/lib/ +cp -a /usr/local/lib/libMagickCore-* /output/lib/ +cp -a /usr/local/lib/libMagickWand-* /output/lib/ +cp -a /usr/local/include/ImageMagick-7 /output/include/ +cp -a /usr/local/lib/pkgconfig/ImageMagick*.pc /output/pkgconfig/ +cp -a /usr/local/lib/pkgconfig/MagickCore*.pc /output/pkgconfig/ +cp -a /usr/local/lib/pkgconfig/MagickWand*.pc /output/pkgconfig/ file /output/bin/magick diff --git a/dependencies/build_libheif.sh b/dependencies/build_libheif.sh index 498af3d8..56e5fe14 100755 --- a/dependencies/build_libheif.sh +++ b/dependencies/build_libheif.sh @@ -1,5 +1,5 @@ -#!/bin/sh -set -eu +#!/bin/bash +set -euo pipefail : ${DEB_HOST_MULTIARCH=`uname -m`-linux-gnu} : ${DEB_HOST_ARCH=`dpkg --print-architecture`} diff --git a/dependencies/build_libraw.sh b/dependencies/build_libraw.sh index 223fd1ae..71d67b04 100755 --- a/dependencies/build_libraw.sh +++ b/dependencies/build_libraw.sh @@ -1,5 +1,5 @@ -#!/bin/sh -set -eu +#!/bin/bash +set -euo pipefail : ${DEB_HOST_MULTIARCH=`uname -m`-linux-gnu} : ${DEB_HOST_ARCH=`dpkg --print-architecture`} diff --git a/dependencies/output.sh b/dependencies/output.sh index 9bea8efe..38c72335 100755 --- a/dependencies/output.sh +++ b/dependencies/output.sh @@ -1,5 +1,5 @@ -#!/bin/sh -set -eu +#!/bin/bash +set -euo pipefail cd /output tar czfv /artifacts.tar.gz * diff --git a/dependencies/prepare.sh b/dependencies/prepare.sh index 5f86d55f..fd7faf51 100755 --- a/dependencies/prepare.sh +++ b/dependencies/prepare.sh @@ -1,5 +1,5 @@ -#!/bin/sh -set -eu +#!/bin/bash +set -euo pipefail : ${TARGETPLATFORM=linux/`dpkg --print-architecture`}