From ca39d79b8b046c5cc07287461093823510b9fa9e Mon Sep 17 00:00:00 2001 From: Carl Smedstad Date: Tue, 4 Jan 2022 15:09:21 +0100 Subject: [PATCH 1/2] Install checkdepends In the switch to paru the run.sh script stopped installing checkdepends, apparently this is not something that 'paru -U --noconfirm' does. Added it back using the old method. --- run.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/run.sh b/run.sh index 5db8d58..f838643 100755 --- a/run.sh +++ b/run.sh @@ -6,6 +6,12 @@ set -e cp -r /pkg /tmp/pkg cd /tmp/pkg +# Install checkdepends +# shellcheck disable=1091 +. ./PKGBUILD +# shellcheck disable=2154 +echo "${checkdepends[@]}" | xargs paru -Sy --noconfirm + # Do the actual building. Paru will fetch all dependencies for us (including # AUR dependencies) and then build the package. paru -U --noconfirm From ba78d4affd1643a1f26b24d7d0df6ab46452ca6e Mon Sep 17 00:00:00 2001 From: Carl Smedstad Date: Sun, 6 Mar 2022 09:38:34 +0100 Subject: [PATCH 2/2] Use a login shell as entrypoint Without this some important environment variables are not set, such as perl executables being added to PATH. --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9b70eb3..36c280e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ USER build WORKDIR /home/build # Auto-fetch GPG keys (for checking signatures): +# hadolint ignore=DL3003 RUN mkdir .gnupg && \ touch .gnupg/gpg.conf && \ echo "keyserver-options auto-key-retrieve" > .gnupg/gpg.conf && \ @@ -23,4 +24,5 @@ COPY run.sh /run.sh # Build the package WORKDIR /pkg -CMD ["/bin/bash", "/run.sh"] +CMD ["/run.sh"] +ENTRYPOINT ["/bin/bash", "--login", "-c"]