From 42e2738a27e503dc9f011a09ce2cdcca2b34ee6d Mon Sep 17 00:00:00 2001 From: Runrioter Date: Fri, 10 Apr 2026 21:32:30 +0800 Subject: [PATCH 1/2] perf: delete unnecessary command --- src/typescript-node/.devcontainer/Dockerfile | 6 --- .../scripts/install-subversion.sh | 42 ------------------- 2 files changed, 48 deletions(-) delete mode 100644 src/typescript-node/.devcontainer/scripts/install-subversion.sh diff --git a/src/typescript-node/.devcontainer/Dockerfile b/src/typescript-node/.devcontainer/Dockerfile index 10e264765b..7a2df40c1b 100644 --- a/src/typescript-node/.devcontainer/Dockerfile +++ b/src/typescript-node/.devcontainer/Dockerfile @@ -7,12 +7,6 @@ ARG NODE_MODULES="tslint-to-eslint-config typescript" RUN su node -c "umask 0002 && npm install -g ${NODE_MODULES}" \ && npm cache clean --force > /dev/null 2>&1 -# Fixing vulnerability issue CVE-2024-46901 by upgrading svn to 1.14.5. -COPY ./scripts/install-subversion.sh /tmp/install-subversion.sh -RUN chmod +x /tmp/install-subversion.sh -RUN /tmp/install-subversion.sh \ - && rm -f /tmp/install-subversion.sh - # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ # && apt-get -y install --no-install-recommends diff --git a/src/typescript-node/.devcontainer/scripts/install-subversion.sh b/src/typescript-node/.devcontainer/scripts/install-subversion.sh deleted file mode 100644 index 114a47b15b..0000000000 --- a/src/typescript-node/.devcontainer/scripts/install-subversion.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -set -eux - -REQUIRED="1.14.5" - -# Determine current svn version if present -current="" -if command -v svn >/dev/null 2>&1; then - current="$(svn --version --quiet 2>/dev/null || true)" -fi - -# If current version is >= REQUIRED, skip building -if [ -n "${current}" ] && dpkg --compare-versions "${current}" ge "${REQUIRED}"; then - echo "Subversion ${current} is >= ${REQUIRED}; skipping build." - exit 0 -fi - -URL="https://archive.apache.org/dist/subversion/subversion-1.14.5.tar.gz" -TMP="/tmp" -TARBALL="subversion-1.14.5.tar.gz" -SRCDIR="subversion-1.14.5" - -if wget -q -O "${TMP}/${TARBALL}" "${URL}"; then - echo "Downloaded ${TARBALL} — building..." - apt-get remove -y subversion libsvn1 || true - cd "${TMP}" - tar -xzf "${TARBALL}" - cd "${SRCDIR}" - apt-get update -y - apt-get install -y --no-install-recommends build-essential autoconf libtool libsqlite3-dev pkg-config libapr1-dev libaprutil1-dev liblz4-dev libutf8proc-dev zlib1g-dev - ./configure --with-lz4=internal --prefix=/usr - make -j"$(nproc 2>/dev/null || getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)" - make install - cd / - rm -rf "${TMP:?}/${SRCDIR}" "${TMP:?}/${TARBALL}" - apt-get purge -y --auto-remove build-essential autoconf libtool pkg-config - rm -rf /var/lib/apt/lists/* - echo "Subversion built and installed (build deps removed)" -else - echo "Downloading svn source failed, skipping Subversion build" -fi - From fb809c13d4711c5f386e3824a5d25131c9ea824a Mon Sep 17 00:00:00 2001 From: Runrioter Date: Fri, 10 Apr 2026 21:57:38 +0800 Subject: [PATCH 2/2] fix: change manifest and README for version --- src/typescript-node/README.md | 2 +- src/typescript-node/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/typescript-node/README.md b/src/typescript-node/README.md index 1e93cc8029..cad0137c9c 100644 --- a/src/typescript-node/README.md +++ b/src/typescript-node/README.md @@ -30,7 +30,7 @@ You can decide how often you want updates by referencing a [semantic version](ht - `mcr.microsoft.com/devcontainers/typescript-node:4-24` (or `4-24-trixie`, `4-24-bookworm`, `4-24-bullseye`) - `mcr.microsoft.com/devcontainers/typescript-node:4.0-24` (or `4.0-24-trixie`, `4.0-24-bookworm`, `4.0-24-bullseye`) -- `mcr.microsoft.com/devcontainers/typescript-node:4.0.7-24` (or `4.0.7-24-trixie`, `4.0.7-24-bookworm`, `4.0.7-24-bullseye`) +- `mcr.microsoft.com/devcontainers/typescript-node:4.0.8-24` (or `4.0.8-24-trixie`, `4.0.8-24-bookworm`, `4.0.8-24-bullseye`) However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `3-24`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates. diff --git a/src/typescript-node/manifest.json b/src/typescript-node/manifest.json index 7626f8bc0a..0be5e0520a 100644 --- a/src/typescript-node/manifest.json +++ b/src/typescript-node/manifest.json @@ -1,5 +1,5 @@ { - "version": "4.0.7", + "version": "4.0.8", "variants": [ "24-trixie", "22-trixie",