Skip to content

Commit 5b105e4

Browse files
authored
[universal] - Update toolings and vulnerability fix (#1820)
* [universal] - Update toolings and vulnerability fix * Changes as per review comment * CI linter environment updated. FIxing the JSON linter error * Removing `FlarCompat` in the ESLint configuration.
1 parent da1ee61 commit 5b105e4

7 files changed

Lines changed: 14 additions & 35 deletions

File tree

.github/linters/eslint.config.mjs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import { defineConfig } from "eslint/config";
2-
import { FlatCompat } from "@eslint/eslintrc";
32
import js from "@eslint/js";
43
import globals from "globals";
5-
import jsoncParser from "jsonc-eslint-parser";
6-
7-
const compat = new FlatCompat();
4+
import jsoncPlugin from "eslint-plugin-jsonc";
85

96
export default defineConfig([
107
js.configs.recommended,
@@ -44,12 +41,5 @@ export default defineConfig([
4441
},
4542
},
4643

47-
...compat.extends("plugin:jsonc/recommended-with-jsonc"),
48-
{
49-
files: ["**/*.json"],
50-
languageOptions: {
51-
parser: jsoncParser,
52-
parserOptions: { jsonSyntax: "JSONC" },
53-
},
54-
},
55-
]);
44+
...jsoncPlugin.configs["flat/recommended-with-jsonc"],
45+
]);

src/universal/.devcontainer/devcontainer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
},
2424
"./local-features/nvs": "latest",
2525
"ghcr.io/devcontainers/features/python:1": {
26-
"version": "3.12.1",
27-
"additionalVersions": "3.11.9",
26+
"version": "3.14.2",
27+
"additionalVersions": "3.13.8",
2828
"installJupyterlab": "true",
2929
"configureJupyterlabAllowOrigin": "*",
3030
"useOryxIfAvailable": "false"
@@ -38,8 +38,8 @@
3838
"version": "latest"
3939
},
4040
"ghcr.io/devcontainers/features/ruby:1": {
41-
"version": "3.4.7",
42-
"additionalVersions": "3.3.10"
41+
"version": "3.4.9",
42+
"additionalVersions": "3.3.11"
4343
},
4444
"ghcr.io/devcontainers/features/java:1": {
4545
"version": "25",

src/universal/.devcontainer/local-features/patch-conda/install.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ sudo_if /opt/conda/bin/python3 -m pip install --upgrade pip
5151
# Temporary: Upgrade python packages due to security vulnerabilities
5252
# They are installed by the conda feature and Conda distribution does not have the patches
5353

54-
# https://github.com/advisories/GHSA-79v4-65xg-pq4g
55-
update_python_package /opt/conda/bin/python3 cryptography "44.0.1"
54+
# https://github.com/advisories/GHSA-r6ph-v2qm-q3c2
55+
update_conda_package pyopenssl "26.0.0"
5656

57-
update_conda_package pyopenssl "25.0.0"
57+
update_conda_package cryptography "46.0.5"
5858

5959
# https://github.com/advisories/GHSA-9hjg-9r4m-mvj7
6060
update_conda_package requests "2.32.4"

src/universal/.devcontainer/local-features/patch-python/install.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,3 @@ update_package() {
3838
sudo_if "$PYTHON_PATH -m pip install --upgrade --no-cache-dir $PACKAGE==$VERSION"
3939
sudo_if "$PYTHON_PATH -m pip show --no-python-version-warning $PACKAGE"
4040
}
41-
# Updating pip version for python 3.11. Must be removed when pinned version 3.11 is updated to a different python version.
42-
sudo_if /usr/local/python/3.11.*/bin/python -m pip install --upgrade pip
43-
44-
# https://github.com/advisories/GHSA-5rjg-fvgr-3xxf
45-
# Updating setuptools version for python 3.11. Must be removed when pinned version 3.11 is updated to a different python version.
46-
update_package /usr/local/python/3.11.*/bin/python setuptools "78.1.1"

src/universal/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ For example:
2929

3030
- `mcr.microsoft.com/devcontainers/universal:6-noble`
3131
- `mcr.microsoft.com/devcontainers/universal:6.0-noble`
32-
- `mcr.microsoft.com/devcontainers/universal:6.0.0-noble`
32+
- `mcr.microsoft.com/devcontainers/universal:6.0.1-noble`
3333

3434
See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/universal/tags/list).
3535

src/universal/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "6.0.0",
2+
"version": "6.0.1",
33
"build": {
44
"latest": true,
55
"rootDistro": "debian",

src/universal/test-project/test.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,15 +175,10 @@ ls -la /home/codespace
175175
checkPythonPackageVersion "python" "setuptools" "78.1.1"
176176
checkPythonPackageVersion "python" "requests" "2.31.0"
177177

178-
## Python -alternative version 3.11. Must be removed when pinned version 3.11 is updated to a different python version.
179-
checkPythonPackageVersion "/usr/local/python/3.11.*/bin/python" "setuptools" "78.1.1"
180-
pip_version_3_11=$(/usr/local/python/3.11.*/bin/python -m pip --version)
181-
check-version-ge "pip-version-for-3.11" "${pip_version_3_11}" "pip 25.3"
182-
183178
## Conda Python
184179
checkCondaPackageVersion "requests" "2.31.0"
185-
checkCondaPackageVersion "cryptography" "44.0.1"
186-
checkCondaPackageVersion "pyopenssl" "25.0.0"
180+
checkCondaPackageVersion "cryptography" "46.0.5"
181+
checkCondaPackageVersion "pyopenssl" "26.0.0"
187182
checkCondaPackageVersion "urllib3" "2.6.3"
188183
checkCondaPackageVersion "brotli" "1.2.0"
189184

0 commit comments

Comments
 (0)