diff --git a/.github/actions/grype/exceptions.yaml b/.github/actions/grype/exceptions.yaml index 87cdb38d..79aa6e53 100644 --- a/.github/actions/grype/exceptions.yaml +++ b/.github/actions/grype/exceptions.yaml @@ -2,31 +2,16 @@ # report unfiltered. # # npm's bundled development-tool dependencies. -# npm 11.21.0 and 12.2.0 both bundle these versions; upstream: npm/cli#10062. +# npm 11.21.1 and 12.2.1 both bundle undici 6.29.0 (via node-gyp); the fix is +# in undici 6.29.1. Upstream: npm/cli#10163. # Review by 2026-11-05, or when npm publishes corrected bundles. # Removal tracking: https://github.com/wodby/php/issues/250 ignore: - - vulnerability: CVE-2026-19534 + - vulnerability: CVE-2026-109869 include-aliases: true - reason: "npm bundles undici 6.28.0; awaiting an upstream bundle refresh. Review by 2026-11-05: https://github.com/wodby/php/issues/250" + reason: "npm bundles undici 6.29.0; awaiting an upstream bundle refresh. Review by 2026-11-05: https://github.com/wodby/php/issues/250" package: name: undici - version: "6.28.0" + version: "6.29.0" type: npm location: /usr/lib/node_modules/npm/node_modules/undici/package.json - - vulnerability: CVE-2026-102276 - include-aliases: true - reason: "npm bundles brace-expansion 5.0.9; awaiting an upstream bundle refresh. Review by 2026-11-05: https://github.com/wodby/php/issues/250" - package: - name: brace-expansion - version: "5.0.9" - type: npm - location: /usr/lib/node_modules/npm/node_modules/brace-expansion/package.json - - vulnerability: CVE-2026-102278 - include-aliases: true - reason: "npm bundles brace-expansion 5.0.9; awaiting an upstream bundle refresh. Review by 2026-11-05: https://github.com/wodby/php/issues/250" - package: - name: brace-expansion - version: "5.0.9" - type: npm - location: /usr/lib/node_modules/npm/node_modules/brace-expansion/package.json diff --git a/8/Dockerfile b/8/Dockerfile index 77da3e0e..0234f157 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -118,8 +118,8 @@ RUN --mount=type=secret,id=composer_auth set -xe; \ \ if [[ -n "${PHP_DEV}" ]]; then \ apk add --update --no-cache -t .wodby-php-dev-run-deps npm tig tmux ripgrep jq; \ - # Stay on npm 11 until npm 12 ships fixes for its bundled dependencies. - npm install --global --prefix /usr npm@11; \ + # Follow npm 12 releases; npm@latest would move to a new major without review. + npm install --global --prefix /usr npm@12; \ npm cache clean --force; \ mkdir -p /usr/local/lib/node_modules /usr/local/bin; \ chown wodby:wodby /usr/local/lib/node_modules /usr/local/bin; \