From 608a32cdf1db2341a00b18349ec5f214e0b18f08 Mon Sep 17 00:00:00 2001 From: Xpl0itU <24777100+Xpl0itU@users.noreply.github.com> Date: Sat, 20 Jan 2024 19:42:42 +0100 Subject: [PATCH] Put LD_LIBRARY_PATH on the Dockerfile --- .github/workflows/linux.yml | 2 +- Dockerfile.linux | 3 ++- pkg/aria2go/go.mod | 1 - pkg/aria2go/go.sum | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b2c5423..4f982b8 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -25,7 +25,7 @@ jobs: - name: Deploy WiiUDownloader run: | mv main WiiUDownloader - docker run --privileged --rm -e LD_LIBRARY_PATH=$LD_LIBRARY_PATH:pkg/aria2go/aria2-lib/lib DEPLOY_GTK_VERSION=3 -e OUTPUT="WiiUDownloader-Linux-x86_64.AppImage" -e UPDATE_INFORMATION="gh-releases-zsync|Xpl0itU|WiiUDownloader|latest|WiiUDownloader-*.AppImage.zsync" -v ${PWD}:/project builder linuxdeploy.AppImage --plugin gtk --plugin checkrt --output=appimage --create-desktop-file --executable=WiiUDownloader --appdir dist --icon-file data/WiiUDownloader.png + docker run --privileged --rm -e DEPLOY_GTK_VERSION=3 -e OUTPUT="WiiUDownloader-Linux-x86_64.AppImage" -e UPDATE_INFORMATION="gh-releases-zsync|Xpl0itU|WiiUDownloader|latest|WiiUDownloader-*.AppImage.zsync" -v ${PWD}:/project builder linuxdeploy.AppImage --plugin gtk --plugin checkrt --output=appimage --create-desktop-file --executable=WiiUDownloader --appdir dist --icon-file data/WiiUDownloader.png - name: Upload Linux Artifact uses: ncipollo/release-action@v1 with: diff --git a/Dockerfile.linux b/Dockerfile.linux index 8e299a4..5d34135 100644 --- a/Dockerfile.linux +++ b/Dockerfile.linux @@ -1,7 +1,8 @@ FROM ubuntu:22.04 ENV DEBIAN_FRONTEND=noninteractive \ - PATH="$HOME/go/bin:/usr/local/go/bin:$PATH" + PATH="$HOME/go/bin:/usr/local/go/bin:$PATH" \ + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:pkg/aria2go/aria2-lib/lib" RUN mkdir -p /usr/share/man/man1 /usr/share/man/man2 && \ apt -y --no-install-recommends update && \ diff --git a/pkg/aria2go/go.mod b/pkg/aria2go/go.mod index 1b0732f..3dc5966 100644 --- a/pkg/aria2go/go.mod +++ b/pkg/aria2go/go.mod @@ -4,5 +4,4 @@ go 1.12 require ( github.com/benesch/cgosymbolizer v0.0.0-20190515212042-bec6fe6e597b // indirect - github.com/ianlancetaylor/cgosymbolizer v0.0.0-20231130194700-cfcb2fd150eb // indirect ) diff --git a/pkg/aria2go/go.sum b/pkg/aria2go/go.sum index 45f19f7..b1000f8 100644 --- a/pkg/aria2go/go.sum +++ b/pkg/aria2go/go.sum @@ -1,4 +1,2 @@ github.com/benesch/cgosymbolizer v0.0.0-20190515212042-bec6fe6e597b h1:5JgaFtHFRnOPReItxvhMDXbvuBkjSWE+9glJyF466yw= github.com/benesch/cgosymbolizer v0.0.0-20190515212042-bec6fe6e597b/go.mod h1:eMD2XUcPsHYbakFEocKrWZp47G0MRJYoC60qFblGjpA= -github.com/ianlancetaylor/cgosymbolizer v0.0.0-20231130194700-cfcb2fd150eb h1:asfjGoPvNgSPvgbBiwFqMUOgWgid8xlQGCGHfgM/PAs= -github.com/ianlancetaylor/cgosymbolizer v0.0.0-20231130194700-cfcb2fd150eb/go.mod h1:DvXTE/K/RtHehxU8/GtDs4vFtfw64jJ3PaCnFri8CRg=