Merge branch 'main' into patch-1

devcontainers · Feb 16, 2024 · 25b5adb · 25b5adb
2 parents 610d945 + af4be44
commit 25b5adb
Show file tree

Hide file tree

Showing 27 changed files with 3,511 additions and 451 deletions.
diff --git a/cgmanifest.json b/cgmanifest.json
@@ -63,7 +63,7 @@
                 "Type": "Pip",
                 "Pip": {
                     "Name": "certifi",
-                    "Version": "2023.11.17"
+                    "Version": "2024.2.2"
                 }
             }
         },
@@ -170,7 +170,7 @@
                 "Git": {
                     "Name": "Oh My Zsh!",
                     "repositoryUrl": "https://github.com/ohmyzsh/ohmyzsh",
-                    "commitHash": "5ea2c68be88452b33b35ba8004fc9094618bcd87"
+                    "commitHash": "883da63320806532f3d3246b03f934e15aff3bab"
                 }
             }
         },
@@ -179,7 +179,7 @@
                 "Type": "other",
                 "Other": {
                     "Name": "git",
-                    "Version": "2.43.0",
+                    "Version": "2.43.1",
                     "DownloadUrl": "https://github.com/git/git"
                 }
             }
@@ -200,7 +200,7 @@
                 "Git": {
                     "Name": "Oh My Zsh!",
                     "repositoryUrl": "https://github.com/ohmyzsh/ohmyzsh",
-                    "commitHash": "212437090032ea1c8c7ccbc1bc2937083c2e7185"
+                    "commitHash": "8f22370af8bd390ea3b8610da1ccf388826d909d"
                 }
             }
         },
@@ -300,17 +300,7 @@
                 "Git": {
                     "Name": "vcpkg",
                     "repositoryUrl": "https://github.com/microsoft/vcpkg",
-                    "commitHash": "fecdd89f28ed883b26a48c2b30085f6384070bb8"
-                }
-            }
-        },
-        {
-            "Component": {
-                "Type": "git",
-                "Git": {
-                    "Name": "vcpkg",
-                    "repositoryUrl": "https://github.com/microsoft/vcpkg",
-                    "commitHash": "710677da49b03885c65c8b5ca43072d4b1acde75"
+                    "commitHash": "345ac44ab8d6a16239d3af55df9608bf725e7a48"
                 }
             }
         },
@@ -496,7 +486,7 @@
                 "Type": "go",
                 "Go": {
                     "Name": "github.com/mgechev/revive",
-                    "Version": "1.3.6"
+                    "Version": "1.3.7"
                 }
             }
         },
@@ -536,6 +526,16 @@
                 }
             }
         },
+        {
+            "Component": {
+                "Type": "other",
+                "Other": {
+                    "Name": "Docker Image: golang",
+                    "Version": "1.22-bookworm",
+                    "DownloadUrl": "https://hub.docker.com/_/golang"
+                }
+            }
+        },
         {
             "Component": {
                 "Type": "other",
@@ -556,6 +556,16 @@
                 }
             }
         },
+        {
+            "Component": {
+                "Type": "other",
+                "Other": {
+                    "Name": "Docker Image: golang",
+                    "Version": "1.22-bullseye",
+                    "DownloadUrl": "https://hub.docker.com/_/golang"
+                }
+            }
+        },
         {
             "Component": {
                 "Type": "other",
@@ -621,7 +631,7 @@
                 "Git": {
                     "Name": "Oh My Zsh!",
                     "repositoryUrl": "https://github.com/ohmyzsh/ohmyzsh",
-                    "commitHash": "212437090032ea1c8c7ccbc1bc2937083c2e7185"
+                    "commitHash": "8f22370af8bd390ea3b8610da1ccf388826d909d"
                 }
             }
         },
@@ -696,7 +706,7 @@
                 "Type": "RubyGems",
                 "RubyGems": {
                     "Name": "bundler",
-                    "Version": "2.5.5"
+                    "Version": "2.5.6"
                 }
             }
         },
@@ -714,7 +724,7 @@
                 "Type": "RubyGems",
                 "RubyGems": {
                     "Name": "github-pages",
-                    "Version": "228"
+                    "Version": "229"
                 }
             }
         },
@@ -901,7 +911,7 @@
                 "Type": "other",
                 "Other": {
                     "Name": "Composer",
-                    "Version": "2.6.6",
+                    "Version": "2.7.1",
                     "DownloadUrl": "https://getcomposer.org/"
                 }
             }
@@ -1249,7 +1259,7 @@
                 "Type": "cargo",
                 "Cargo": {
                     "Name": "rust-analysis",
-                    "Version": "1.75.0"
+                    "Version": "1.76.0"
                 }
             }
         },
@@ -1258,7 +1268,7 @@
                 "Type": "cargo",
                 "Cargo": {
                     "Name": "rust-src",
-                    "Version": "1.75.0"
+                    "Version": "1.76.0"
                 }
             }
         },
@@ -1267,7 +1277,7 @@
                 "Type": "cargo",
                 "Cargo": {
                     "Name": "clippy",
-                    "Version": "1.75.0"
+                    "Version": "1.76.0"
                 }
             }
         },
@@ -1423,7 +1433,7 @@
                 "Type": "Pip",
                 "Pip": {
                     "Name": "numpy",
-                    "Version": "1.26.3"
+                    "Version": "1.26.4"
                 }
             }
         },
@@ -1499,15 +1509,6 @@
                 }
             }
         },
-        {
-            "Component": {
-                "Type": "Pip",
-                "Pip": {
-                    "Name": "certifi",
-                    "Version": "2024.2.2"
-                }
-            }
-        },
         {
             "Component": {
                 "Type": "Pip",
@@ -1540,7 +1541,7 @@
                 "Git": {
                     "Name": "Oh My Zsh!",
                     "repositoryUrl": "https://github.com/ohmyzsh/ohmyzsh",
-                    "commitHash": "212437090032ea1c8c7ccbc1bc2937083c2e7185"
+                    "commitHash": "8f22370af8bd390ea3b8610da1ccf388826d909d"
                 }
             }
         },
@@ -1609,7 +1610,7 @@
                 "Type": "other",
                 "Other": {
                     "Name": "Go",
-                    "Version": "1.21.6",
+                    "Version": "1.22.0",
                     "DownloadUrl": "https://golang.org/dl"
                 }
             }

diff --git a/src/anaconda/.devcontainer/Dockerfile b/src/anaconda/.devcontainer/Dockerfile
@@ -7,9 +7,7 @@ RUN . /etc/os-release && if [ "${VERSION_CODENAME}" != "bullseye" ]; then exit 1
 # They are installed by the base image (continuumio/anaconda3) which does not have the patch.
 RUN conda install \
     # https://github.com/advisories/GHSA-v845-jxx5-vc9f
-    urllib3==1.26.18 \
-    # https://github.com/advisories/GHSA-jfhm-5ghh-2f97
-    cryptography==41.0.7
+    urllib3==1.26.18
 
 RUN python3 -m pip install --upgrade \
     # https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-21797
@@ -37,7 +35,9 @@ RUN python3 -m pip install --upgrade \
     # https://github.com/advisories/GHSA-44cc-43rp-5947
     jupyterlab==4.0.11 \
     # https://github.com/advisories/GHSA-5h86-8mv2-jq9f
-    aiohttp==3.9.2
+    aiohttp==3.9.2 \
+    # https://github.com/advisories/GHSA-3ww4-gg4f-jr7f
+    cryptography==42.0.0
 
 # Reset and copy updated files with updated privs to keep image size down
 FROM mcr.microsoft.com/devcontainers/base:1-bullseye

diff --git a/src/anaconda/history/0.204.10.md b/src/anaconda/history/0.204.10.md
@@ -0,0 +1,107 @@
+# [anaconda](https://github.com/devcontainers/images/tree/main/src/anaconda)
+
+**Image version:** 0.204.10
+
+**Source release/branch:** [v0.3.31](https://github.com/devcontainers/images/tree/v0.3.31/src/anaconda)
+
+**Digest:** sha256:42446429c51579525aaefd7546e81dd16fcaad64726723263aeeadf4abe64573
+
+**Tags:**
+```
+mcr.microsoft.com/devcontainers/anaconda:0.204.10-3
+```
+> *To keep up to date, we recommend using partial version numbers. Use the major version number to get all non-breaking changes (e.g. `0-`) or major and minor to only get fixes (e.g. `0.200-`).*
+
+**Linux distribution:** Debian GNU/Linux 11 (bullseye)
+
+**Architectures:** linux/amd64, linux/arm64
+
+**Available (non-root) user:** vscode
+
+### Contents
+**Languages and runtimes**
+
+| Language / runtime | Version | Path |
+|--------------------|---------|------|
+| [Python](https://www.python.org/) | 3.11.5 | /opt/conda |
+| [Jupyter Notebooks](https://jupyter.org/) | 6.5.4 | /opt/conda |
+| [Jupyter Lab](https://jupyter.org/) | 4.0.11 | /opt/conda |
+
+**Tools installed using git**
+
+| Tool | Commit | Path |
+|------|--------|------|
+| [Oh My Zsh!](https://github.com/ohmyzsh/ohmyzsh) | 883da63320806532f3d3246b03f934e15aff3bab | /home/vscode/.oh-my-zsh |
+
+**Pip / pipx installed tools and packages**
+
+| Tool / package | Version |
+|----------------|---------|
+| joblib | 1.3.1 |
+| cookiecutter | 2.2.3 |
+| cryptography | 41.0.7 |
+| mistune | 3.0.1 |
+| numpy | 1.25.2 |
+| certifi | 2024.2.2 |
+| setuptools | 68.0.0 |
+| future | 0.18.3 |
+| wheel | 0.38.4 |
+| nbconvert | 7.7.3 |
+| Werkzeug | 2.3.6 |
+| requests | 2.31.0 |
+| tornado | 6.3.3 |
+| transformers | 4.36.0 |
+| jupyter_server | 2.7.2 |
+
+**Other tools and utilities**
+
+| Tool | Version | Path |
+|------|---------|------|
+| [git](https://github.com/git/git) | 2.43.1 | 
+| [conda](https://github.com/conda/conda) | 23.7.4 | /opt/conda |
+
+**Additional linux tools and packages**
+
+| Tool / library | Version |
+|----------------|---------|
+| apt-transport-https | 2.2.4 |
+| apt-utils | 2.2.4 |
+| ca-certificates | 20210119 |
+| curl | 7.74.0-1.3+deb11u11 |
+| dialog | 1.3-20201126-1 |
+| git | 1:2.30.2-1+deb11u2 |
+| gnupg2 | 2.2.27-2+deb11u2 |
+| htop | 3.0.5-7 |
+| iproute2 | 5.10.0-4 |
+| jq | 1.6-2.1 |
+| less | 551-2 |
+| libc6 | 2.31-13+deb11u8 |
+| libgssapi-krb5-2 | 1.18.3-6+deb11u4 |
+| libicu67 | 67.1-7 |
+| libkrb5-3 | 1.18.3-6+deb11u4 |
+| liblttng-ust0 | 2.12.1-1 |
+| libssl1.1 | 1.1.1w-0+deb11u1 |
+| libstdc++6 | 10.2.1-6 |
+| locales | 2.31-13+deb11u8 |
+| lsb-release | 11.1.0 |
+| lsof | 4.93.2+dfsg-1.1 |
+| man-db | 2.9.4-2 |
+| manpages | 5.10-1 |
+| manpages-dev | 5.10-1 |
+| nano | 5.4-2+deb11u2 |
+| ncdu | 1.15.1-1 |
+| net-tools | 1.60+git20181103.0eebece-1 |
+| openssh-client | 1:8.4p1-5+deb11u3 |
+| procps | 2:3.3.17-5 |
+| psmisc | 23.4-2 |
+| rsync | 3.2.3-4+deb11u1 |
+| strace | 5.10-1 |
+| sudo | 1.9.5p2-3+deb11u1 |
+| unzip | 6.0-26+deb11u1 |
+| vim-tiny | 2:8.2.2434-3+deb11u1 |
+| wget | 1.21-1+deb11u1 |
+| yarn | 1.22.19-1 |
+| zip | 3.0-12 |
+| zlib1g | 1:1.2.11.dfsg-2+deb11u2 |
+| zsh | 5.8-6+deb11u1 |
+
diff --git a/src/anaconda/history/dev.md b/src/anaconda/history/dev.md
@@ -4,7 +4,7 @@
 
 **Source release/branch:** [main](https://github.com/devcontainers/images/tree/main/src/anaconda)
 
-**Digest:** sha256:965375477f5a21a0ca8b2fd4c98e3f81ffb323c082dfed7bea6aa40165ecb22a
+**Digest:** sha256:325da1654aca86e62d4acfb6d0ec94fbccf68e4f431121ad67710583c50797ea
 
 **Tags:**
 ```
@@ -31,7 +31,7 @@ mcr.microsoft.com/devcontainers/anaconda:dev-3
 
 | Tool | Commit | Path |
 |------|--------|------|
-| [Oh My Zsh!](https://github.com/ohmyzsh/ohmyzsh) | 5ea2c68be88452b33b35ba8004fc9094618bcd87 | /home/vscode/.oh-my-zsh |
+| [Oh My Zsh!](https://github.com/ohmyzsh/ohmyzsh) | 883da63320806532f3d3246b03f934e15aff3bab | /home/vscode/.oh-my-zsh |
 
 **Pip / pipx installed tools and packages**
 
@@ -42,7 +42,7 @@ mcr.microsoft.com/devcontainers/anaconda:dev-3
 | cryptography | 41.0.7 |
 | mistune | 3.0.1 |
 | numpy | 1.25.2 |
-| certifi | 2023.11.17 |
+| certifi | 2024.2.2 |
 | setuptools | 68.0.0 |
 | future | 0.18.3 |
 | wheel | 0.38.4 |
@@ -57,7 +57,7 @@ mcr.microsoft.com/devcontainers/anaconda:dev-3
 
 | Tool | Version | Path |
 |------|---------|------|
-| [git](https://github.com/git/git) | 2.43.0 | 
+| [git](https://github.com/git/git) | 2.43.1 | 
 | [conda](https://github.com/conda/conda) | 23.7.4 | /opt/conda |
 
 **Additional linux tools and packages**
@@ -75,14 +75,14 @@ mcr.microsoft.com/devcontainers/anaconda:dev-3
 | iproute2 | 5.10.0-4 |
 | jq | 1.6-2.1 |
 | less | 551-2 |
-| libc6 | 2.31-13+deb11u7 |
+| libc6 | 2.31-13+deb11u8 |
 | libgssapi-krb5-2 | 1.18.3-6+deb11u4 |
 | libicu67 | 67.1-7 |
 | libkrb5-3 | 1.18.3-6+deb11u4 |
 | liblttng-ust0 | 2.12.1-1 |
 | libssl1.1 | 1.1.1w-0+deb11u1 |
 | libstdc++6 | 10.2.1-6 |
-| locales | 2.31-13+deb11u7 |
+| locales | 2.31-13+deb11u8 |
 | lsb-release | 11.1.0 |
 | lsof | 4.93.2+dfsg-1.1 |
 | man-db | 2.9.4-2 |