Skip to content

Commit 530fce8

Browse files
gauravsaini04gauravsaini04
authored
Merge branch 'devcontainers:main' into miniconda_tqdm_GHSA-g7vv-2v7x-gj9p 
2 parents 1b2795a + f1addfb commit 530fce8

File tree

54 files changed

+10585
-252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+10585
-252
lines changed

‎.github/actions/smoke-test/check-image-size.sh‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash
2+
3+
set -e
4+
25
# Function to handle errors
36
handle_error() {
47
local exit_code=$?
@@ -8,7 +11,6 @@ handle_error() {
811
exit $exit_code
912
}
1013
trap 'handle_error $LINENO ${BASH_COMMAND%% *}' ERR
11-
echo "This is line $LINENO"
1214

1315
convert_gb_to_bytes() {
1416
local gb="$1"
@@ -52,6 +54,7 @@ check_image_size() {
5254
if [ -n $image_size ] && [ $image_size -gt $threshold ]; then
5355
echo -e "\nImage size exceeds the threshold of $THRESHOLD_IN_GB gb"
5456
echo -e "\n❌ Image size check failed."
57+
exit 1;
5558
else
5659
echo -e "\n✅ Passed!"
5760
fi

‎.github/workflows/smoke-universal.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ jobs:
2626
uses: ./.github/actions/smoke-test
2727
with:
2828
image: universal
29-
threshold: 14
29+
threshold: 10

‎cgmanifest.json‎

Lines changed: 38 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
"Git": {
171171
"Name": "Oh My Zsh!",
172172
"repositoryUrl": "https://github.com/ohmyzsh/ohmyzsh",
173-
"commitHash": "130002a79e8567befa409177990bb2724b8edefc"
173+
"commitHash": "8c5f64cc2f0e75399a1e906e39713ed25b65ece1"
174174
}
175175
}
176176
},
@@ -179,7 +179,7 @@
179179
"Type": "other",
180180
"Other": {
181181
"Name": "git",
182-
"Version": "2.44.0",
182+
"Version": "2.45.0",
183183
"DownloadUrl": "https://github.com/git/git"
184184
}
185185
}
@@ -200,17 +200,7 @@
200200
"Git": {
201201
"Name": "Oh My Zsh!",
202202
"repositoryUrl": "https://github.com/ohmyzsh/ohmyzsh",
203-
"commitHash": "668ca3a32dae5ff5d164fc3be565f1e2ece248db"
204-
}
205-
}
206-
},
207-
{
208-
"Component": {
209-
"Type": "other",
210-
"Other": {
211-
"Name": "git",
212-
"Version": "2.45.0",
213-
"DownloadUrl": "https://github.com/git/git"
203+
"commitHash": "b0561d28b5a3efbbcca4700626fa32e62c23959b"
214204
}
215205
}
216206
},
@@ -320,7 +310,7 @@
320310
"Git": {
321311
"Name": "vcpkg",
322312
"repositoryUrl": "https://github.com/microsoft/vcpkg",
323-
"commitHash": "28b1cf627c0570b3e094192df2fce31a3a2bc1d3"
313+
"commitHash": "3dcd8bb40bc2bbedf206e0bf0dc72c26e2aa2ddd"
324314
}
325315
}
326316
},
@@ -354,6 +344,16 @@
354344
}
355345
}
356346
},
347+
{
348+
"Component": {
349+
"Type": "other",
350+
"Other": {
351+
"Name": "Docker Image: buildpack-deps",
352+
"Version": "noble-curl",
353+
"DownloadUrl": "https://hub.docker.com/_/buildpack-deps"
354+
}
355+
}
356+
},
357357
{
358358
"Component": {
359359
"Type": "other",
@@ -546,16 +546,6 @@
546546
}
547547
}
548548
},
549-
{
550-
"Component": {
551-
"Type": "git",
552-
"Git": {
553-
"Name": "Oh My Zsh!",
554-
"repositoryUrl": "https://github.com/ohmyzsh/ohmyzsh",
555-
"commitHash": "8c5f64cc2f0e75399a1e906e39713ed25b65ece1"
556-
}
557-
}
558-
},
559549
{
560550
"Component": {
561551
"Type": "other",
@@ -641,7 +631,7 @@
641631
"Git": {
642632
"Name": "Oh My Zsh!",
643633
"repositoryUrl": "https://github.com/ohmyzsh/ohmyzsh",
644-
"commitHash": "668ca3a32dae5ff5d164fc3be565f1e2ece248db"
634+
"commitHash": "b0561d28b5a3efbbcca4700626fa32e62c23959b"
645635
}
646636
}
647637
},
@@ -1330,6 +1320,16 @@
13301320
}
13311321
}
13321322
},
1323+
{
1324+
"Component": {
1325+
"Type": "other",
1326+
"Other": {
1327+
"Name": "Docker Image: node",
1328+
"Version": "22-bookworm",
1329+
"DownloadUrl": "https://hub.docker.com/_/node"
1330+
}
1331+
}
1332+
},
13331333
{
13341334
"Component": {
13351335
"Type": "other",
@@ -1350,6 +1350,16 @@
13501350
}
13511351
}
13521352
},
1353+
{
1354+
"Component": {
1355+
"Type": "other",
1356+
"Other": {
1357+
"Name": "Docker Image: node",
1358+
"Version": "22-bullseye",
1359+
"DownloadUrl": "https://hub.docker.com/_/node"
1360+
}
1361+
}
1362+
},
13531363
{
13541364
"Component": {
13551365
"Type": "other",
@@ -1533,7 +1543,7 @@
15331543
"Git": {
15341544
"Name": "Oh My Zsh!",
15351545
"repositoryUrl": "https://github.com/ohmyzsh/ohmyzsh",
1536-
"commitHash": "668ca3a32dae5ff5d164fc3be565f1e2ece248db"
1546+
"commitHash": "5947c3c3c91d04fa0bff45866938027b85b56c6e"
15371547
}
15381548
}
15391549
},
@@ -1592,7 +1602,7 @@
15921602
"Type": "other",
15931603
"Other": {
15941604
"Name": "GitHub CLI",
1595-
"Version": "2.49.0",
1605+
"Version": "2.49.1",
15961606
"DownloadUrl": "https://github.com/cli/cli"
15971607
}
15981608
}
@@ -1602,7 +1612,7 @@
16021612
"Type": "other",
16031613
"Other": {
16041614
"Name": "Go",
1605-
"Version": "1.22.2",
1615+
"Version": "1.22.3",
16061616
"DownloadUrl": "https://golang.org/dl"
16071617
}
16081618
}

‎src/anaconda/.devcontainer/Dockerfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ RUN python3 -m pip install --upgrade \
2020
mistune==3.0.1 \
2121
# https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-34141
2222
numpy==1.25.2 \
23-
# https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-25577
24-
werkzeug==2.3.6 \
23+
# https://github.com/advisories/GHSA-2g68-c3qc-8985
24+
werkzeug==3.0.3 \
2525
# https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-32862
2626
nbconvert==7.7.3 \
2727
# https://github.com/advisories/GHSA-qppv-j76h-2rpx
@@ -45,7 +45,9 @@ RUN python3 -m pip install --upgrade \
4545
# https://github.com/advisories/GHSA-4qhp-652w-c22x
4646
jupyter-lsp==2.2.2 \
4747
# https://github.com/advisories/GHSA-jjg7-2v4v-x38h
48-
idna==3.7
48+
idna==3.7 \
49+
# https://github.com/advisories/GHSA-h75v-3vvj-5mfj
50+
jinja2==3.1.4
4951

5052
# Reset and copy updated files with updated privs to keep image size down
5153
FROM mcr.microsoft.com/devcontainers/base:1-bullseye

‎src/anaconda/history/0.204.15.md‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
# [anaconda](https://github.com/devcontainers/images/tree/main/src/anaconda)
2+
3+
**Image version:** 0.204.15
4+
5+
**Source release/branch:** [v0.3.36](https://github.com/devcontainers/images/tree/v0.3.36/src/anaconda)
6+
7+
**Digest:** sha256:96538878ed877716d6758c290b77082f5fc2a2d5e7d44bf44987fb1bebb1c26a
8+
9+
**Tags:**
10+
```
11+
mcr.microsoft.com/devcontainers/anaconda:0.204.15-3
12+
```
13+
> *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-`).*
14+
15+
**Linux distribution:** Debian GNU/Linux 11 (bullseye)
16+
17+
**Architectures:** linux/amd64, linux/arm64
18+
19+
**Available (non-root) user:** vscode
20+
21+
### Contents
22+
**Languages and runtimes**
23+
24+
| Language / runtime | Version | Path |
25+
|--------------------|---------|------|
26+
| [Python](https://www.python.org/) | 3.11.7 | /opt/conda |
27+
| [Jupyter Notebooks](https://jupyter.org/) | 7.0.8 | /opt/conda |
28+
| [Jupyter Lab](https://jupyter.org/) | 4.0.11 | /opt/conda |
29+
30+
**Tools installed using git**
31+
32+
| Tool | Commit | Path |
33+
|------|--------|------|
34+
| [Oh My Zsh!](https://github.com/ohmyzsh/ohmyzsh) | 130002a79e8567befa409177990bb2724b8edefc | /home/vscode/.oh-my-zsh |
35+
36+
**Pip / pipx installed tools and packages**
37+
38+
| Tool / package | Version |
39+
|----------------|---------|
40+
| joblib | 1.3.1 |
41+
| cookiecutter | 2.2.3 |
42+
| cryptography | 42.0.4 |
43+
| mistune | 3.0.1 |
44+
| numpy | 1.25.2 |
45+
| certifi | 2024.2.2 |
46+
| setuptools | 68.2.2 |
47+
| future | 0.18.3 |
48+
| wheel | 0.41.2 |
49+
| nbconvert | 7.7.3 |
50+
| Werkzeug | 2.3.6 |
51+
| requests | 2.31.0 |
52+
| tornado | 6.3.3 |
53+
| transformers | 4.36.0 |
54+
| jupyter_server | 2.7.2 |
55+
56+
**Other tools and utilities**
57+
58+
| Tool | Version | Path |
59+
|------|---------|------|
60+
| [git](https://github.com/git/git) | 2.44.0 |
61+
| [conda](https://github.com/conda/conda) | 24.4.0 | /opt/conda |
62+
63+
**Additional linux tools and packages**
64+
65+
| Tool / library | Version |
66+
|----------------|---------|
67+
| apt-transport-https | 2.2.4 |
68+
| apt-utils | 2.2.4 |
69+
| ca-certificates | 20210119 |
70+
| curl | 7.74.0-1.3+deb11u11 |
71+
| dialog | 1.3-20201126-1 |
72+
| git | 1:2.30.2-1+deb11u2 |
73+
| gnupg2 | 2.2.27-2+deb11u2 |
74+
| htop | 3.0.5-7 |
75+
| iproute2 | 5.10.0-4 |
76+
| jq | 1.6-2.1 |
77+
| less | 551-2+deb11u2 |
78+
| libc6 | 2.31-13+deb11u10 |
79+
| libgssapi-krb5-2 | 1.18.3-6+deb11u4 |
80+
| libicu67 | 67.1-7 |
81+
| libkrb5-3 | 1.18.3-6+deb11u4 |
82+
| liblttng-ust0 | 2.12.1-1 |
83+
| libssl1.1 | 1.1.1w-0+deb11u1 |
84+
| libstdc++6 | 10.2.1-6 |
85+
| locales | 2.31-13+deb11u10 |
86+
| lsb-release | 11.1.0 |
87+
| lsof | 4.93.2+dfsg-1.1 |
88+
| man-db | 2.9.4-2 |
89+
| manpages | 5.10-1 |
90+
| manpages-dev | 5.10-1 |
91+
| nano | 5.4-2+deb11u2 |
92+
| ncdu | 1.15.1-1 |
93+
| net-tools | 1.60+git20181103.0eebece-1 |
94+
| openssh-client | 1:8.4p1-5+deb11u3 |
95+
| procps | 2:3.3.17-5 |
96+
| psmisc | 23.4-2 |
97+
| rsync | 3.2.3-4+deb11u1 |
98+
| strace | 5.10-1 |
99+
| sudo | 1.9.5p2-3+deb11u1 |
100+
| unzip | 6.0-26+deb11u1 |
101+
| vim-tiny | 2:8.2.2434-3+deb11u1 |
102+
| wget | 1.21-1+deb11u1 |
103+
| yarn | 1.22.19-1 |
104+
| zip | 3.0-12 |
105+
| zlib1g | 1:1.2.11.dfsg-2+deb11u2 |
106+
| zsh | 5.8-6+deb11u1 |
107+

0 commit comments

Comments
 (0)