Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 24.13/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ FROM cimg/base:2025.10

LABEL maintainer="CircleCI Execution Team <eng-execution@circleci.com>"

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" && \
Expand Down
10 changes: 5 additions & 5 deletions 24.13/browsers/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 <community-partner@circleci.com>"

Expand Down Expand Up @@ -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; \
Expand All @@ -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; \
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 25.6/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ FROM cimg/base:2025.10

LABEL maintainer="CircleCI Execution Team <eng-execution@circleci.com>"

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" && \
Expand Down
2 changes: 1 addition & 1 deletion 25.6/browsers/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 <community-partner@circleci.com>"

Expand Down
4 changes: 2 additions & 2 deletions ALIASES
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
lts=24.13.0
current=25.6.0
current=25.6.1
lts=24.13.1
2 changes: 1 addition & 1 deletion GEN-CHECK
Original file line number Diff line number Diff line change
@@ -1 +1 @@
GEN_CHECK=(25.6.0=current)
GEN_CHECK=(25.6.1=current 24.13.1=lts)
6 changes: 4 additions & 2 deletions build-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
6 changes: 4 additions & 2 deletions push-images.sh
Original file line number Diff line number Diff line change
@@ -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