rainysy/SubConverter-Extended
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(package): avoid armv7 runtime root lib conflict

Browse Source
This commit is contained in:
Aethersailor
2026-06-01 19:16:18 +08:00
parent b9e8dea1b0
commit d48175430b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
docker/Dockerfile.armv7-cross
View File

@@ -191,7 +191,16 @@ RUN set -xe && \
libnss_dns.so.2 \
libnss_files.so.2 \
libnss_compat.so.2 \
libresolv.so.2
libresolv.so.2 && \
if [ -d /runtime-root/lib ]; then \
install -d /runtime-root/usr/lib/arm-linux-gnueabihf; \
find /runtime-root/lib -maxdepth 1 -type f -name '*.so*' -exec mv -f -t /runtime-root/usr/lib/arm-linux-gnueabihf {} +; \
if [ -d /runtime-root/lib/arm-linux-gnueabihf ]; then \
cp -a /runtime-root/lib/arm-linux-gnueabihf/. /runtime-root/usr/lib/arm-linux-gnueabihf/; \
rm -rf /runtime-root/lib/arm-linux-gnueabihf; \
fi; \
rmdir /runtime-root/lib 2>/dev/null || true; \
fi
# ========== FINAL STAGE ==========
FROM --platform=$TARGETPLATFORM mirror.gcr.io/library/debian:trixie-slim