mirror of
https://git.vectorsigma.ru/public/photoview.git
synced 2026-07-28 20:28:46 +00:00
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:
@@ -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 \
|
||||
|
||||
15
dependencies/build_imagemagick.sh
vendored
15
dependencies/build_imagemagick.sh
vendored
@@ -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
|
||||
|
||||
4
dependencies/build_libheif.sh
vendored
4
dependencies/build_libheif.sh
vendored
@@ -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`}
|
||||
|
||||
4
dependencies/build_libraw.sh
vendored
4
dependencies/build_libraw.sh
vendored
@@ -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`}
|
||||
|
||||
4
dependencies/output.sh
vendored
4
dependencies/output.sh
vendored
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
|
||||
cd /output
|
||||
tar czfv /artifacts.tar.gz *
|
||||
|
||||
4
dependencies/prepare.sh
vendored
4
dependencies/prepare.sh
vendored
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
|
||||
: ${TARGETPLATFORM=linux/`dpkg --print-architecture`}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user