From fcdb23a9274a136655a6e22667d38ca8514830be Mon Sep 17 00:00:00 2001 From: cpe-image-bot Date: Tue, 10 Feb 2026 15:55:56 +0000 Subject: [PATCH] Publish v25.6.1 and v24.13.1. [release] --- 24.13/Dockerfile | 2 +- 24.13/browsers/Dockerfile | 10 +++++----- 25.6/Dockerfile | 2 +- 25.6/browsers/Dockerfile | 2 +- ALIASES | 4 ++-- GEN-CHECK | 2 +- build-images.sh | 6 ++++-- push-images.sh | 6 ++++-- 8 files changed, 19 insertions(+), 15 deletions(-) diff --git a/24.13/Dockerfile b/24.13/Dockerfile index 4334e3a..01a2e81 100644 --- a/24.13/Dockerfile +++ b/24.13/Dockerfile @@ -10,7 +10,7 @@ FROM cimg/base:2025.10 LABEL maintainer="CircleCI Execution Team " -ENV NODE_VERSION=24.13.0 +ENV NODE_VERSION=24.13.1 RUN [[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="arm64" && \ curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" && \ diff --git a/24.13/browsers/Dockerfile b/24.13/browsers/Dockerfile index b784f9e..f9c226b 100644 --- a/24.13/browsers/Dockerfile +++ b/24.13/browsers/Dockerfile @@ -6,7 +6,7 @@ # the browsers variant. The normal version is based on the node variant of that # image. As this IS a Node image, there isn't a node variant. -FROM cimg/node:24.13.0 +FROM cimg/node:24.13.1 LABEL maintainer="CircleCI Community & Partner Engineering Team " @@ -56,6 +56,7 @@ RUN sudo apt-get update && \ # when booting the image. LABEL com.circleci.preserve-entrypoint=true +ENV XVFB_TIMEOUT="30" ENV DISPLAY=":99" RUN printf '#!/bin/sh\n\n' | sudo tee /docker-entrypoint.sh; \ @@ -67,10 +68,9 @@ RUN printf '#!/bin/sh\n\n' | sudo tee /docker-entrypoint.sh; \ printf 'Xvfb ${DISPLAY_NUM} -screen 0 ${SCREEN_RES} &\n' | sudo tee -a /docker-entrypoint.sh; \ printf 'XVFB_PID=$!\n\n' | sudo tee -a /docker-entrypoint.sh; \ \ - printf 'WAIT_TIMEOUT=10\n' | sudo tee -a /docker-entrypoint.sh; \ printf 'ATTEMPTS=0\n' | sudo tee -a /docker-entrypoint.sh; \ - printf 'while [ ! -f ${LOCK_FILE} ] && [ ${ATTEMPTS} -lt ${WAIT_TIMEOUT} ]; do\n' | sudo tee -a /docker-entrypoint.sh; \ - printf ' echo "Waiting for Xvfb to start... (Attempt ${ATTEMPTS}/${WAIT_TIMEOUT})"\n' | sudo tee -a /docker-entrypoint.sh; \ + printf 'while [ ! -f ${LOCK_FILE} ] && [ ${ATTEMPTS} -lt ${XVFB_TIMEOUT} ]; do\n' | sudo tee -a /docker-entrypoint.sh; \ + printf ' echo "Waiting for Xvfb to start... (Attempt ${ATTEMPTS}/${XVFB_TIMEOUT})"\n' | sudo tee -a /docker-entrypoint.sh; \ printf ' sleep 1\n' | sudo tee -a /docker-entrypoint.sh; \ printf ' ATTEMPTS=$((ATTEMPTS + 1))\n' | sudo tee -a /docker-entrypoint.sh; \ printf ' if ! kill -0 $XVFB_PID 2>/dev/null; then\n' | sudo tee -a /docker-entrypoint.sh; \ @@ -81,12 +81,12 @@ RUN printf '#!/bin/sh\n\n' | sudo tee /docker-entrypoint.sh; \ \ printf 'if [ -f ${LOCK_FILE} ]; then\n' | sudo tee -a /docker-entrypoint.sh; \ printf ' echo "Xvfb started successfully."\n' | sudo tee -a /docker-entrypoint.sh; \ - printf ' # The DISPLAY environment variable is already set by ENV in the Dockerfile\n' | sudo tee -a /docker-entrypoint.sh; \ printf ' exec "$@"\n' | sudo tee -a /docker-entrypoint.sh; \ printf 'else\n' | sudo tee -a /docker-entrypoint.sh; \ printf ' echo "Error: Xvfb failed to start within the timeout."\n' | sudo tee -a /docker-entrypoint.sh; \ printf ' exit 1\n' | sudo tee -a /docker-entrypoint.sh; \ printf 'fi\n' | sudo tee -a /docker-entrypoint.sh; \ + \ printf 'exec "$@"\n' | sudo tee -a /docker-entrypoint.sh; \ \ sudo chmod +x /docker-entrypoint.sh diff --git a/25.6/Dockerfile b/25.6/Dockerfile index 1aa82cd..4cd92be 100644 --- a/25.6/Dockerfile +++ b/25.6/Dockerfile @@ -10,7 +10,7 @@ FROM cimg/base:2025.10 LABEL maintainer="CircleCI Execution Team " -ENV NODE_VERSION=25.6.0 +ENV NODE_VERSION=25.6.1 RUN [[ $(uname -m) == "x86_64" ]] && ARCH="x64" || ARCH="arm64" && \ curl -L -o node.tar.xz "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${ARCH}.tar.xz" && \ diff --git a/25.6/browsers/Dockerfile b/25.6/browsers/Dockerfile index f2cdfb9..82acea9 100644 --- a/25.6/browsers/Dockerfile +++ b/25.6/browsers/Dockerfile @@ -6,7 +6,7 @@ # the browsers variant. The normal version is based on the node variant of that # image. As this IS a Node image, there isn't a node variant. -FROM cimg/node:25.6.0 +FROM cimg/node:25.6.1 LABEL maintainer="CircleCI Community & Partner Engineering Team " diff --git a/ALIASES b/ALIASES index 36df7e9..02a51a3 100644 --- a/ALIASES +++ b/ALIASES @@ -1,2 +1,2 @@ -lts=24.13.0 -current=25.6.0 +current=25.6.1 +lts=24.13.1 diff --git a/GEN-CHECK b/GEN-CHECK index 11f1a1e..d923b65 100644 --- a/GEN-CHECK +++ b/GEN-CHECK @@ -1 +1 @@ -GEN_CHECK=(25.6.0=current) +GEN_CHECK=(25.6.1=current 24.13.1=lts) diff --git a/build-images.sh b/build-images.sh index 3cc2d56..66ec9f4 100755 --- a/build-images.sh +++ b/build-images.sh @@ -4,5 +4,7 @@ set -eo pipefail docker context create cimg docker buildx create --use cimg -docker buildx build --platform=linux/amd64,linux/arm64 --file 25.6/Dockerfile -t cimg/node:25.6.0 -t cimg/node:25.6 --push . -docker buildx build --platform=linux/amd64 --file 25.6/browsers/Dockerfile -t cimg/node:25.6.0-browsers -t cimg/node:25.6-browsers --push . +docker buildx build --platform=linux/amd64,linux/arm64 --file 25.6/Dockerfile -t cimg/node:25.6.1 -t cimg/node:25.6 --push . +docker buildx build --platform=linux/amd64 --file 25.6/browsers/Dockerfile -t cimg/node:25.6.1-browsers -t cimg/node:25.6-browsers --push . +docker buildx build --platform=linux/amd64,linux/arm64 --file 24.13/Dockerfile -t cimg/node:24.13.1 -t cimg/node:24.13 --push . +docker buildx build --platform=linux/amd64 --file 24.13/browsers/Dockerfile -t cimg/node:24.13.1-browsers -t cimg/node:24.13-browsers --push . diff --git a/push-images.sh b/push-images.sh index 746c0cf..549c264 100755 --- a/push-images.sh +++ b/push-images.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash # Do not edit by hand; please use build scripts/templates to make changes set -eo pipefail -docker buildx imagetools create -t cimg/node:current cimg/node:25.6.0 -docker buildx imagetools create -t cimg/node:current-browsers cimg/node:25.6.0-browsers +docker buildx imagetools create -t cimg/node:current cimg/node:25.6.1 +docker buildx imagetools create -t cimg/node:current-browsers cimg/node:25.6.1-browsers +docker buildx imagetools create -t cimg/node:lts cimg/node:24.13.1 +docker buildx imagetools create -t cimg/node:lts-browsers cimg/node:24.13.1-browsers