Dockerfile: fail fast if mbuffer is not compatible/fetchable [#589] (#…

…635) * Dockerfile: fail fast if mbuffer is not compatible/fetchable [#589] * Dockerfile: comment that Alpine version bumps may require Perl bumps * Update expect.txt --------- Co-authored-by: Tobias Oetiker <[email protected]>
oetiker · Mar 13, 2024 · 2861d7b · 2861d7b
1 parent aa0bfed
commit 2861d7b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/spelling/expect.txt b/.github/workflows/spelling/expect.txt
@@ -71,6 +71,7 @@ Bznapzendzetup
 Bznapzendztatz
 canmount
 CBuilder
+cdn
 cfg
 cgi
 cgit

diff --git a/Dockerfile b/Dockerfile
@@ -20,10 +20,14 @@ FROM docker.io/library/alpine:${ALPINE_VERSION} as runtime
 ARG PERL_VERSION=5.38.2-r0
 
 RUN \
+  # mbuffer is not in main currently, and community keys expire over time,
+  # so gotta bump ALPINE_VERSION above regularly (and likely PERL_VERSION
+  # as dictated by the newer OS release). Request its package first to fail
+  # fast in such case. Note that while "--allow-untrusted" might be an option,
+  # shared libraries referenced by the binary make an older distro outdated.
+  apk add --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ mbuffer && \
   # nano is for the interactive "edit" command in znapzendzetup if preferred over vi
   apk add --no-cache zfs curl bash autoconf automake nano perl=${PERL_VERSION} openssh && \
-  # mbuffer is not in main currently
-  apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/community/ mbuffer && \
   ln -s /dev/stdout /var/log/syslog && \
   ln -s /usr/bin/perl /usr/local/bin/perl
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,6 +71,7 @@ Bznapzendzetup @@
     Bznapzendztatz
     canmount
     CBuilder
+    cdn
     cfg
     cgi
     cgit
@@ Expand Down @@