From b7fdf8da275da3ac5f3458a027098daf7bc85bdf Mon Sep 17 00:00:00 2001 From: "Henrique F. Simoes" Date: Fri, 2 Aug 2024 11:03:23 -0300 Subject: [PATCH] ioc: install busybox symbolic links. Make all busybox goodies directly available in PATH, to avoid having to call them from the multicall binary. This allows the removal of the wget package from the build image, since busybox provides its own version, and it's become simpler to use that. However, the version packaged by Debian does not implement the `-o` flag, requiring us to use shell redirection instead. Fixes: 8f02abc2047d5087ce69ed032b4e42006ec56605 --- Dockerfile | 3 +-- base/lnls-get-n-unpack.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4b039fc..1bbafb1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,10 +16,9 @@ RUN apt update -y && \ busybox \ netcat-openbsd \ procserv \ - wget \ $([ -n "$RUNTIME_PIP_PACKAGES" ] && echo pip) \ $RUNTIME_PACKAGES && \ - ln -s /bin/busybox /usr/bin/unzip && \ + busybox --install && \ apt clean && \ rm -rf /var/lib/apt/lists/* diff --git a/base/lnls-get-n-unpack.sh b/base/lnls-get-n-unpack.sh index c1779d6..f14470f 100755 --- a/base/lnls-get-n-unpack.sh +++ b/base/lnls-get-n-unpack.sh @@ -18,7 +18,7 @@ for url; do download_dir=$(mktemp -d) echo Downloading "$url"... - wget -P $download_dir -o /tmp/wget.log "$url" || (cat /tmp/wget.log && false) + wget -P $download_dir "$url" &> /tmp/wget.log || (cat /tmp/wget.log && false) filename=$(basename $download_dir/*)