Skip to content

Commit 1f6f293

Browse files
Merge branch 'main' into typescript_node_trixie
2 parents a6f82a9 + 27641b8 commit 1f6f293

File tree

28 files changed

+146
-106
lines changed

28 files changed

+146
-106
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
55
"ghcr.io/devcontainers/features/azure-cli:1": {}
66
},
7-
"postCreateCommand": "corepack enable && corepack prepare yarn@4.9.4 --activate && npm install -g @devcontainers/cli",
7+
"postCreateCommand": "sudo corepack enable && corepack prepare yarn@4.9.4 --activate && npm install -g @devcontainers/cli",
88
"customizations": {
99
"vscode": {
1010
"extensions": [

.github/workflows/push-again.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ jobs:
6060
6161
# Setup build CLI
6262
cd "$GITHUB_WORKSPACE/ref"
63+
# This is required to set yarn 4.9.4 as the global yarn version in the runner is 1.22.22
64+
sudo corepack enable
65+
sudo corepack prepare yarn@4.9.4 --activate
6366
yarn install
6467
npm install -g @devcontainers/cli
6568

.github/workflows/push-dev.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ jobs:
4848
ACR_REGISTRY_NAME=$(echo "$REGISTRY" | grep -oP '(.+)(?=\.azurecr\.io)')
4949
az acr login --name $ACR_REGISTRY_NAME --username $TOKEN_NAME --password $PASSWORD
5050
51+
# This is required to set yarn 4.9.4 as the global yarn version in the runner is 1.22.22
52+
sudo corepack enable
53+
sudo corepack prepare yarn@4.9.4 --activate
5154
# Build and push dev images
5255
yarn install
5356
npm install -g @devcontainers/cli

.github/workflows/push-manual-dev.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ jobs:
5656
5757
# Setup build CLI
5858
cd "$GITHUB_WORKSPACE/ref"
59+
# This is required to set yarn 4.9.4 as the global yarn version in the runner is 1.22.22
60+
sudo corepack enable
61+
sudo corepack prepare yarn@4.9.4 --activate
5962
yarn install
6063
npm install -g @devcontainers/cli
6164

.github/workflows/push.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ jobs:
5151
ACR_REGISTRY_NAME=$(echo "$REGISTRY" | grep -oP '(.+)(?=\.azurecr\.io)')
5252
az acr login --name $ACR_REGISTRY_NAME --username $TOKEN_NAME --password $PASSWORD
5353
54+
# This is required to set yarn 4.9.4 as the global yarn version in the runner is 1.22.22
55+
sudo corepack enable
56+
sudo corepack prepare yarn@4.9.4 --activate
5457
# Build and push images
5558
yarn install
5659
npm install -g @devcontainers/cli

.github/workflows/version-history.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ jobs:
6464
ACR_REGISTRY_NAME=$(echo "$REGISTRY" | grep -oP '(.+)(?=\.azurecr\.io)')
6565
az acr login --name $ACR_REGISTRY_NAME --username $TOKEN_NAME --password $PASSWORD
6666
67+
# This is required to set yarn 4.9.4 as the global yarn version in the runner is 1.22.22
68+
sudo corepack enable
69+
sudo corepack prepare yarn@4.9.4 --activate
6770
yarn install
6871
RELEASE_STRING=$(echo "${{ inputs.release }}" | grep -oP 'refs/(heads|tags)/\K(.+)')
6972
OVERWRITE_STRING=$(if [ "${{ inputs.overwrite }}" = "false" ]; then echo '--no-overwrite'; else echo '--overwrite'; fi)

src/anaconda/.devcontainer/apply_security_patches.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# vulnerabilities:
44
# werkzeug - [GHSA-f9vj-2wh5-fj8j]
55

6-
vulnerable_packages=( "mistune=3.0.1" "aiohttp=3.10.11" "cryptography=44.0.1" "h11=0.16.0" "jinja2=3.1.6" "jupyter_core=5.8.1" "protobuf=4.25.8" "requests=2.32.4" "setuptools=78.1.1" "transformers=4.52.1" "urllib3=2.5.0" "Werkzeug=3.0.6" "jupyter-lsp=2.2.2" "scrapy=2.11.2" \
6+
vulnerable_packages=( "mistune=3.0.1" "aiohttp=3.10.11" "cryptography=44.0.1" "h11=0.16.0" "jinja2=3.1.6" "jupyter_core=5.8.1" "protobuf=5.29.5" "requests=2.32.4" "setuptools=78.1.1" "transformers=4.53.0" "urllib3=2.5.0" "Werkzeug=3.0.6" "jupyter-lsp=2.2.2" "scrapy=2.11.2" \
77
"zipp=3.19.1" "tornado=6.4.2")
88

99
# Define the number of rows (based on the length of vulnerable_packages)
@@ -26,7 +26,7 @@ done
2626

2727
# Add an array for packages that should always pin to the provided version,
2828
# even if higher version is available in conda channel
29-
pin_to_required_version=("jupyter_core" "cryptography" )
29+
pin_to_required_version=("jupyter_core" "cryptography")
3030
# Function to check if a package is in the pin_to_required_version array
3131
function is_pin_to_required_version() {
3232
local pkg="$1"

src/anaconda/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
2929
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
3030

3131
- `mcr.microsoft.com/devcontainers/anaconda:1-3`
32-
- `mcr.microsoft.com/devcontainers/anaconda:1.0-3`
33-
- `mcr.microsoft.com/devcontainers/anaconda:1.0.0-3`
32+
- `mcr.microsoft.com/devcontainers/anaconda:1.3-3`
33+
- `mcr.microsoft.com/devcontainers/anaconda:1.3.0-3`
3434

3535
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/anaconda/tags/list).
3636

src/anaconda/manifest.json

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

src/anaconda/test-project/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ checkPythonPackageVersion "certifi" "2022.12.07"
4141
checkPythonPackageVersion "cryptography" "44.0.1"
4242
checkPythonPackageVersion "h11" "0.16.0"
4343
checkPythonPackageVersion "jupyter_core" "5.8.1"
44-
checkPythonPackageVersion "protobuf" "4.25.8"
45-
checkPythonPackageVersion "transformers" "4.52.1"
44+
checkPythonPackageVersion "protobuf" "5.29.5"
45+
checkPythonPackageVersion "transformers" "4.53.0"
4646
checkPythonPackageVersion "mpmath" "1.3.0"
4747
checkPythonPackageVersion "aiohttp" "3.10.2"
4848
checkPythonPackageVersion "tornado" "6.4.2"

0 commit comments

Comments
 (0)