Skip to content

Commit 20404aa

Browse files
committed
Update Dockerfiles to log Ubuntu 26.04 LTS and enforce IPv4 for curl commands
1 parent f58c5fb commit 20404aa

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

docker/Dockerfile.bun-ubuntu-slim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN \
2525
esac \
2626
&& BUN_TARBALL="bun-linux-${BUN_ARCH}.zip" \
2727
&& BUN_BASE_URL="https://github.com/oven-sh/bun/releases/latest/download" \
28-
&& curl -fsSL "${BUN_BASE_URL}/${BUN_TARBALL}" -o /tmp/bun.zip \
28+
&& curl -4 -fsSL "${BUN_BASE_URL}/${BUN_TARBALL}" -o /tmp/bun.zip \
2929
&& mkdir -p /opt/bun/bin \
3030
&& unzip -q /tmp/bun.zip -d /tmp/bun \
3131
&& mv /tmp/bun/bun-linux-${BUN_ARCH}/bun /opt/bun/bin/bun \
@@ -53,7 +53,7 @@ ARG BUILD_DATE
5353

5454
# ---- OCI standard labels (https://opencontainers.org/) ----
5555
LABEL org.opencontainers.image.title="matterbridge:bun-ubuntu-slim" \
56-
org.opencontainers.image.description="Ubuntu 24.04.4 LTS (noble) with Bun from github.com/oven-sh/bun" \
56+
org.opencontainers.image.description="Ubuntu 26.04 LTS (resolute) with Bun from github.com/oven-sh/bun" \
5757
org.opencontainers.image.version=$VERSION \
5858
org.opencontainers.image.revision=$VCS_REF \
5959
org.opencontainers.image.source="git+https://github.com/Luligu/matterbridge.git" \

docker/Dockerfile.node-ubuntu-slim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN \
2525
esac \
2626
&& NODE_PATTERN="linux-${NODE_ARCH}\\.tar\\.xz$" \
2727
&& NODE_BASE_URL="https://nodejs.org/dist/latest-v24.x" \
28-
&& curl -fsSL "${NODE_BASE_URL}/SHASUMS256.txt" -o /tmp/SHASUMS256.txt \
28+
&& curl -4 -fsSL "${NODE_BASE_URL}/SHASUMS256.txt" -o /tmp/SHASUMS256.txt \
2929
&& NODE_LINE="$(grep -m 1 "${NODE_PATTERN}" /tmp/SHASUMS256.txt || true)" \
3030
&& if [ -z "${NODE_LINE}" ]; then \
3131
echo >&2 "ERROR: Node.js binary not found for linux-${NODE_ARCH} in dist 'latest-v24.x'."; \
@@ -35,7 +35,7 @@ RUN \
3535
fi \
3636
&& NODE_SHA256="$(echo "${NODE_LINE}" | awk '{print $1}')" \
3737
&& NODE_TARBALL="$(echo "${NODE_LINE}" | awk '{print $2}')" \
38-
&& curl -fsSL "${NODE_BASE_URL}/${NODE_TARBALL}" -o /tmp/node.tar.xz \
38+
&& curl -4 -fsSL "${NODE_BASE_URL}/${NODE_TARBALL}" -o /tmp/node.tar.xz \
3939
&& echo "${NODE_SHA256} /tmp/node.tar.xz" | sha256sum -c - \
4040
&& mkdir -p /opt/node \
4141
&& tar -xJf /tmp/node.tar.xz -C /opt/node --strip-components=1 --no-same-owner \
@@ -65,7 +65,7 @@ ARG BUILD_DATE
6565

6666
# ---- OCI standard labels (https://opencontainers.org/) ----
6767
LABEL org.opencontainers.image.title="matterbridge:node-ubuntu-slim" \
68-
org.opencontainers.image.description="Ubuntu 24.04.4 LTS (noble) with Node.js 24 from nodejs.org" \
68+
org.opencontainers.image.description="Ubuntu 26.04 LTS (resolute) with Node.js 24 from nodejs.org" \
6969
org.opencontainers.image.version=$VERSION \
7070
org.opencontainers.image.revision=$VCS_REF \
7171
org.opencontainers.image.source="git+https://github.com/Luligu/matterbridge.git" \

0 commit comments

Comments
 (0)