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.
This commit is contained in:
Googol Lee
2025-05-23 11:27:07 +02:00
committed by GitHub
parent a378522af4
commit 8872ea1df3
6 changed files with 20 additions and 13 deletions

View File

@@ -115,7 +115,7 @@ RUN --mount=type=bind,from=api,source=/dependencies/,target=/dependencies/ \
&& /app/scripts/install_runtime_dependencies.sh \ && /app/scripts/install_runtime_dependencies.sh \
# Install self-building libs # Install self-building libs
&& cd /dependencies \ && cd /dependencies \
&& cp -a lib/* /usr/local/lib/ \ && cp -a lib/*.so* /usr/local/lib/ \
&& cp -a bin/* /usr/local/bin/ \ && cp -a bin/* /usr/local/bin/ \
&& cp -a etc/* /usr/local/etc/ \ && cp -a etc/* /usr/local/etc/ \
&& ldconfig \ && ldconfig \

View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/bash
set -eu set -euo pipefail
: ${DEB_HOST_MULTIARCH=`uname -m`-linux-gnu} : ${DEB_HOST_MULTIARCH=`uname -m`-linux-gnu}
: ${DEB_HOST_ARCH=`dpkg --print-architecture`} : ${DEB_HOST_ARCH=`dpkg --print-architecture`}
@@ -18,7 +18,14 @@ make
make install make install
cd .. 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 /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 file /output/bin/magick

View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/bash
set -eu set -euo pipefail
: ${DEB_HOST_MULTIARCH=`uname -m`-linux-gnu} : ${DEB_HOST_MULTIARCH=`uname -m`-linux-gnu}
: ${DEB_HOST_ARCH=`dpkg --print-architecture`} : ${DEB_HOST_ARCH=`dpkg --print-architecture`}

View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/bash
set -eu set -euo pipefail
: ${DEB_HOST_MULTIARCH=`uname -m`-linux-gnu} : ${DEB_HOST_MULTIARCH=`uname -m`-linux-gnu}
: ${DEB_HOST_ARCH=`dpkg --print-architecture`} : ${DEB_HOST_ARCH=`dpkg --print-architecture`}

View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/bash
set -eu set -euo pipefail
cd /output cd /output
tar czfv /artifacts.tar.gz * tar czfv /artifacts.tar.gz *

View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/bash
set -eu set -euo pipefail
: ${TARGETPLATFORM=linux/`dpkg --print-architecture`} : ${TARGETPLATFORM=linux/`dpkg --print-architecture`}