From 22ba52e3cb1e930da606b47d6492dd43e93167b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristi=C3=A1n=20Kunc?= Date: Mon, 28 Sep 2026 13:31:11 +0000 Subject: [PATCH 1/3] build(devcontainer): add Node.js 24 and Yarn 1.22.22 --- .devcontainer/devcontainer.json | 2 +- dockerfile | 16 ++++++++++++++++ docs/CONTAINER_BUILD.md | 4 ++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e93dc5e5d..990492085 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -10,7 +10,7 @@ "build": { "dockerfile": "../dockerfile" }, - "postCreateCommand": "git config --global --add safe.directory /workspaces/uk-controller-plugin", + "postCreateCommand": "git config --global --add safe.directory /workspaces/uk-controller-plugin && yarn install", "containerUser": "ubuntu", "remoteUser": "ubuntu" } diff --git a/dockerfile b/dockerfile index cd19f22b7..4bd3999ab 100644 --- a/dockerfile +++ b/dockerfile @@ -7,6 +7,7 @@ ARG XWIN_TRIPLE=x86_64-unknown-linux-musl ARG WINDOWS_CRT_VERSION=14.29.16.11 # Old known working = 10.0.20348 ARG WINDOWS_SDK_VERSION=10.0.26100 +ARG NODE_VERSION=24 ADD "https://github.com/Jake-Shadle/xwin/releases/download/${XWIN_VERSION}/xwin-${XWIN_VERSION}-${XWIN_TRIPLE}.tar.gz" \ /tmp/xwin.tar.gz @@ -134,6 +135,21 @@ ENV CURL_INCLUDEDIR=/opt/curl/include/ ENV CURL_LIBRARYDIR=/opt/curl/build/lib/ ENV CURL_DEBUG_LIBRARYDIR=/opt/curl/build/lib/ +# Node.js and Yarn (classic), used by semantic-release and to refresh yarn.lock. +RUN <<-EOF + set -eux + + export DEBIAN_FRONTEND=noninteractive + apt update + apt install -y --no-install-recommends curl ca-certificates gnupg + curl -fsSL "https://deb.nodesource.com/setup_${NODE_VERSION}.x" | bash - + apt install -y nodejs + npm install -g yarn@1.22.22 + apt autoremove -y + apt clean -y + rm -rf /var/lib/apt/lists/* +EOF + USER ubuntu CMD ["/bin/bash"] diff --git a/docs/CONTAINER_BUILD.md b/docs/CONTAINER_BUILD.md index d75906bb5..02b656a08 100644 --- a/docs/CONTAINER_BUILD.md +++ b/docs/CONTAINER_BUILD.md @@ -67,3 +67,7 @@ that the line endings in the Dockerfile are LF, and are not converted to CRLF. By default, Git is not installed within the container. Git operations should be performed on the host machine, or Git installed in the container. + +The container includes Node.js 24 and Yarn 1.22.22, used by the release tooling +(`semantic-release`) and to refresh `yarn.lock`. In the Dev Container, `yarn +install` runs automatically after the container is created. From a56e4d5632ad5a716b7aefc2f45f17088176ca54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristi=C3=A1n=20Kunc?= Date: Mon, 28 Sep 2026 13:49:23 +0000 Subject: [PATCH 2/3] chore: Add node+yarn to devcontainer --- third_party/googletest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/googletest b/third_party/googletest index 52eb8108c..aefb45469 160000 --- a/third_party/googletest +++ b/third_party/googletest @@ -1 +1 @@ -Subproject commit 52eb8108c5bdec04579160ae17225d66034bd723 +Subproject commit aefb45469ee7e6bde0cd1d2c18412046c30e7bb6 From 45c13293146ea55364d05c59e4f876e0ba5cd8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristi=C3=A1n=20Kunc?= Date: Mon, 28 Sep 2026 13:51:19 +0000 Subject: [PATCH 3/3] revert: restore googletest submodule pointer --- third_party/googletest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/googletest b/third_party/googletest index aefb45469..52eb8108c 160000 --- a/third_party/googletest +++ b/third_party/googletest @@ -1 +1 @@ -Subproject commit aefb45469ee7e6bde0cd1d2c18412046c30e7bb6 +Subproject commit 52eb8108c5bdec04579160ae17225d66034bd723