From b7fdf8da275da3ac5f3458a027098daf7bc85bdf Mon Sep 17 00:00:00 2001
From: "Henrique F. Simoes" <henrique.simoes@lnls.br>
Date: Fri, 2 Aug 2024 11:03:23 -0300
Subject: [PATCH 1/2] 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/*)
 

From 26de85cf8976af0660dec822c7e4bd19efd7e5a9 Mon Sep 17 00:00:00 2001
From: "Henrique F. Simoes" <henrique.simoes@lnls.br>
Date: Fri, 23 Aug 2024 12:21:40 -0300
Subject: [PATCH 2/2] README: document installation of archive content.

Fixes: 8f02abc2047d5087ce69ed032b4e42006ec56605
---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index dda5e62..74e1530 100644
--- a/README.md
+++ b/README.md
@@ -72,6 +72,11 @@ Packages that strictly need to be installed via `pip` can be listed under the
 Packages essential to all (or most) IOCs should be added to
 [this repository's `Dockerfile`](./Dockerfile).
 
+Extra files can also be downloaded and installed by listing their TAR or ZIP
+archive URLs under `BUILD_TAR_PACKAGES` or `RUNTIME_TAR_PACKAGES`. To use HTTPS
+(or any other TLS-based protocol), `ca-certificates` must also be added to
+`RUNTIME_PACKAGES`.
+
 The template above assumes the containers will be uploaded to the GitHub
 registry.