Skip to content

Commit 7b13565

Browse files
Merge branch 'main' into alpine_3.22
2 parents 4af645f + 5537b1c commit 7b13565

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/miniconda/.devcontainer/apply_security_patches.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# define array of packages for pinning to the patched versions
77
# vulnerable_packages=( "package1=version1" "package2=version2" "package3=version3" )
8-
vulnerable_packages=( "cryptography=44.0.1" )
8+
vulnerable_packages=( "cryptography=44.0.1" "requests=2.32.4" "urllib3=2.5.0" )
99

1010
# Define the number of rows (based on the length of vulnerable_packages)
1111
rows=${#vulnerable_packages[@]}

src/miniconda/manifest.json

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

src/miniconda/test-project/test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ check "usr-local-etc-config-does-not-exist" test ! -f "/usr/local/etc/gitconfig"
2121
checkPythonPackageVersion "cryptography" "44.0.1"
2222
checkPythonPackageVersion "setuptools" "65.5.1"
2323
checkPythonPackageVersion "wheel" "0.38.1"
24-
checkPythonPackageVersion "urllib3" "2.2.2"
24+
checkPythonPackageVersion "urllib3" "2.5.0"
2525

2626
checkCondaPackageVersion "cryptography" "44.0.1"
2727
checkCondaPackageVersion "setuptools" "65.5.1"
2828
checkCondaPackageVersion "wheel" "0.38.1"
29-
checkCondaPackageVersion "requests" "2.32.0"
30-
checkCondaPackageVersion "urllib3" "1.26.17"
29+
checkCondaPackageVersion "requests" "2.32.4"
30+
checkCondaPackageVersion "urllib3" "2.5.0"
3131
checkCondaPackageVersion "idna" "3.7"
3232
checkCondaPackageVersion "tqdm" "4.66.4"
3333
checkCondaPackageVersion "certifi" "2024.7.4"

0 commit comments

Comments
 (0)