Skip to content

Commit

Permalink
ioc: install busybox symbolic links.
Browse files Browse the repository at this point in the history
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: 8f02abc
  • Loading branch information
henriquesimoes committed Aug 22, 2024
1 parent a782305 commit b7fdf8d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/*

Expand Down
2 changes: 1 addition & 1 deletion base/lnls-get-n-unpack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/*)

Expand Down

0 comments on commit b7fdf8d

Please sign in to comment.