Skip to content

Commit e60a194

Browse files
Merge branch 'main' of https://github.com/devcontainers/images into samruddhikhandale/dual-tag
2 parents 07fd803 + 81cfbdd commit e60a194

File tree

7 files changed

+1304
-6
lines changed

7 files changed

+1304
-6
lines changed

build/src/utils/config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,8 @@ function getSortedDefinitionBuildList(page, pageTotal, definitionsToSkip) {
392392
if (allPages.length > pageTotal) {
393393
// If too many pages, add extra pages to last one
394394
console.log(`(!) Not enough pages to for target page size. Adding excess definitions to last page.`);
395-
for (let i = pageTotal; i < allPages.length; i++) {
395+
let i = pageTotal;
396+
while (i < allPages.length) {
396397
allPages[pageTotal - 1] = allPages[pageTotal - 1].concat(allPages[i]);
397398
allPages.splice(i, 1);
398399
}

src/base-alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# [Choice] Alpine version: 3.15, 3.14, 3.13
2-
ARG VARIANT=3.15
1+
# [Choice] Alpine version: 3.16, 3.15, 3.14, 3.13
2+
ARG VARIANT=3.16
33
FROM alpine:${VARIANT}
44

55
# [Option] Install zsh

src/base-alpine/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
| *Categories* | Core, Other |
1010
| *Image type* | Dockerfile |
1111
| *Published images* | mcr.microsoft.com/devcontainers/base:alpine |
12-
| *Available image variants* | alpine-3.15, alpine-3.14, alpine-3.13 ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
12+
| *Available image variants* | alpine-3.16, alpine-3.15, alpine-3.14, alpine-3.13 ([full list](https://mcr.microsoft.com/v2/devcontainers/base/tags/list)) |
1313
| *Published image architecture(s)* | x86-64, aarch64/arm64 |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Alpine Linux |
@@ -25,6 +25,7 @@ You can also directly reference pre-built versions of `Dockerfile` by using the
2525
- `mcr.microsoft.com/devcontainers/base:alpine-3.13`
2626
- `mcr.microsoft.com/devcontainers/base:alpine-3.14`
2727
- `mcr.microsoft.com/devcontainers/base:alpine-3.15`
28+
- `mcr.microsoft.com/devcontainers/base:alpine-3.16`
2829

2930
You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example:
3031

src/base-alpine/history/0.204.7.md

Lines changed: 273 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,273 @@
1+
# [base-alpine](https://github.com/devcontainers/images/tree/main/src/base-alpine)
2+
3+
**Image version:** 0.204.7
4+
5+
**Source release/branch:** [v0.2.2](https://github.com/devcontainers/images/tree/v0.2.2/src/base-alpine)
6+
7+
**Image variations:**
8+
- [3.16](#variant-316)
9+
- [3.15](#variant-315)
10+
- [3.14](#variant-314)
11+
- [3.13](#variant-313)
12+
13+
## Variant: 3.16
14+
15+
**Digest:** sha256:e8c1e2702b9474564bce05c7791f7929ca1890da6e69cf1c58e8478719832d79
16+
17+
**Tags:**
18+
```
19+
mcr.microsoft.com/devcontainers/base:0.204.7-alpine-3.16
20+
mcr.microsoft.com/devcontainers/base:0.204.7-alpine3.16
21+
```
22+
> *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-`).*
23+
24+
**Linux distribution:** Alpine Linux v3.16
25+
26+
**Architectures:** linux/amd64, linux/arm64
27+
28+
**Available (non-root) user:** vscode
29+
30+
### Contents
31+
**Tools installed using git**
32+
33+
| Tool | Commit | Path |
34+
|------|--------|------|
35+
| [Oh My Zsh!](https://github.com/ohmyzsh/ohmyzsh) | 6d48309cd7da1b91038cf08be7865fb5bb9bc5ea | /home/vscode/.oh-my-zsh |
36+
37+
**Additional linux tools and packages**
38+
39+
| Tool / library | Version |
40+
|----------------|---------|
41+
| git | 2.36.2-r0 |
42+
| openssh-client-default | 9.0_p1-r2 |
43+
| gnupg | 2.2.35-r4 |
44+
| procps | 3.3.17-r1 |
45+
| lsof | 4.95.0-r0 |
46+
| htop | 3.2.0-r1 |
47+
| net-tools | 2.10-r0 |
48+
| psmisc | 23.5-r0 |
49+
| curl | 7.83.1-r2 |
50+
| wget | 1.21.3-r0 |
51+
| rsync | 3.2.4-r2 |
52+
| ca-certificates | 20220614-r0 |
53+
| unzip | 6.0-r9 |
54+
| zip | 3.0-r9 |
55+
| nano | 6.3-r0 |
56+
| vim | 8.2.5000-r0 |
57+
| less | 590-r0 |
58+
| jq | 1.6-r1 |
59+
| libgcc | 11.2.1_git20220219-r2 |
60+
| libstdc++ | 11.2.1_git20220219-r2 |
61+
| krb5-libs | 1.19.3-r0 |
62+
| libintl | 0.21-r2 |
63+
| libssl1.1 | 1.1.1q-r0 |
64+
| lttng-ust | 2.13.2-r0 |
65+
| tzdata | 2022c-r0 |
66+
| userspace-rcu | 0.13.1-r0 |
67+
| zlib | 1.2.12-r3 |
68+
| sudo | 1.9.10-r0 |
69+
| coreutils | 9.1-r0 |
70+
| sed | 4.8-r0 |
71+
| grep | 3.7-r0 |
72+
| which | 2.21-r2 |
73+
| ncdu | 1.17-r0 |
74+
| shadow | 4.10-r3 |
75+
| strace | 5.17-r0 |
76+
| man-pages | 5.13-r1 |
77+
78+
## Variant: 3.15
79+
80+
**Digest:** sha256:902e82960168a9463ed5fd979cd81b82d96b1c2d752197dcc85fd2b66d701241
81+
82+
**Tags:**
83+
```
84+
mcr.microsoft.com/devcontainers/base:0.204.7-alpine-3.15
85+
mcr.microsoft.com/devcontainers/base:0.204.7-alpine3.15
86+
mcr.microsoft.com/devcontainers/base:0.204.7-alpine
87+
```
88+
> *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-`).*
89+
90+
**Linux distribution:** Alpine Linux v3.15
91+
92+
**Architectures:** linux/amd64, linux/arm64
93+
94+
**Available (non-root) user:** vscode
95+
96+
### Contents
97+
**Tools installed using git**
98+
99+
| Tool | Commit | Path |
100+
|------|--------|------|
101+
| [Oh My Zsh!](https://github.com/ohmyzsh/ohmyzsh) | 6d48309cd7da1b91038cf08be7865fb5bb9bc5ea | /home/vscode/.oh-my-zsh |
102+
103+
**Additional linux tools and packages**
104+
105+
| Tool / library | Version |
106+
|----------------|---------|
107+
| git | 2.34.4-r0 |
108+
| openssh-client-default | 8.8_p1-r1 |
109+
| gnupg | 2.2.31-r2 |
110+
| procps | 3.3.17-r0 |
111+
| lsof | 4.94.0-r0 |
112+
| htop | 3.1.1-r0 |
113+
| net-tools | 1.60_git20140218-r2 |
114+
| psmisc | 23.4-r0 |
115+
| curl | 7.80.0-r2 |
116+
| wget | 1.21.2-r2 |
117+
| rsync | 3.2.4-r0 |
118+
| ca-certificates | 20220614-r0 |
119+
| unzip | 6.0-r9 |
120+
| zip | 3.0-r9 |
121+
| nano | 5.9-r0 |
122+
| vim | 8.2.4836-r0 |
123+
| less | 590-r0 |
124+
| jq | 1.6-r1 |
125+
| libgcc | 10.3.1_git20211027-r0 |
126+
| libstdc++ | 10.3.1_git20211027-r0 |
127+
| krb5-libs | 1.19.3-r0 |
128+
| libintl | 0.21-r0 |
129+
| libssl1.1 | 1.1.1q-r0 |
130+
| lttng-ust | 2.12.0-r3 |
131+
| tzdata | 2022c-r0 |
132+
| userspace-rcu | 0.12.2-r0 |
133+
| zlib | 1.2.12-r3 |
134+
| sudo | 1.9.8_p2-r1 |
135+
| coreutils | 9.0-r2 |
136+
| sed | 4.8-r0 |
137+
| grep | 3.7-r0 |
138+
| which | 2.21-r2 |
139+
| ncdu | 1.16-r0 |
140+
| shadow | 4.8.1-r1 |
141+
| strace | 5.14-r0 |
142+
| man-pages | 5.13-r0 |
143+
144+
## Variant: 3.14
145+
146+
**Digest:** sha256:382f86f11d8a411cb18e8caecaeb2d17535fbd4d973e635c64060b1eabe66cb9
147+
148+
**Tags:**
149+
```
150+
mcr.microsoft.com/devcontainers/base:0.204.7-alpine-3.14
151+
mcr.microsoft.com/devcontainers/base:0.204.7-alpine3.14
152+
```
153+
> *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-`).*
154+
155+
**Linux distribution:** Alpine Linux v3.14
156+
157+
**Architectures:** linux/amd64, linux/arm64
158+
159+
**Available (non-root) user:** vscode
160+
161+
### Contents
162+
**Tools installed using git**
163+
164+
| Tool | Commit | Path |
165+
|------|--------|------|
166+
| [Oh My Zsh!](https://github.com/ohmyzsh/ohmyzsh) | 6d48309cd7da1b91038cf08be7865fb5bb9bc5ea | /home/vscode/.oh-my-zsh |
167+
168+
**Additional linux tools and packages**
169+
170+
| Tool / library | Version |
171+
|----------------|---------|
172+
| git | 2.32.3-r0 |
173+
| openssh-client-default | 8.6_p1-r3 |
174+
| gnupg | 2.2.31-r1 |
175+
| procps | 3.3.17-r0 |
176+
| lsof | 4.94.0-r0 |
177+
| htop | 3.0.5-r2 |
178+
| net-tools | 1.60_git20140218-r2 |
179+
| psmisc | 23.4-r0 |
180+
| curl | 7.79.1-r2 |
181+
| wget | 1.21.1-r1 |
182+
| rsync | 3.2.4-r0 |
183+
| ca-certificates | 20220614-r0 |
184+
| unzip | 6.0-r9 |
185+
| zip | 3.0-r9 |
186+
| nano | 5.7-r2 |
187+
| vim | 8.2.4836-r0 |
188+
| less | 581-r1 |
189+
| jq | 1.6-r1 |
190+
| libgcc | 10.3.1_git20210424-r2 |
191+
| libstdc++ | 10.3.1_git20210424-r2 |
192+
| krb5-libs | 1.18.5-r0 |
193+
| libintl | 0.21-r0 |
194+
| libssl1.1 | 1.1.1q-r0 |
195+
| lttng-ust | 2.12.0-r3 |
196+
| tzdata | 2022c-r0 |
197+
| userspace-rcu | 0.12.2-r0 |
198+
| zlib | 1.2.12-r3 |
199+
| sudo | 1.9.7_p1-r1 |
200+
| coreutils | 8.32-r2 |
201+
| sed | 4.8-r0 |
202+
| grep | 3.7-r0 |
203+
| which | 2.21-r1 |
204+
| ncdu | 1.15.1-r0 |
205+
| shadow | 4.8.1-r0 |
206+
| strace | 5.12-r0 |
207+
| man-pages | 5.11-r0 |
208+
209+
## Variant: 3.13
210+
211+
**Digest:** sha256:27285348c4e76bbe4187bcf7903d34e312b288d982ed4865307b7f8837d3a37d
212+
213+
**Tags:**
214+
```
215+
mcr.microsoft.com/devcontainers/base:0.204.7-alpine-3.13
216+
mcr.microsoft.com/devcontainers/base:0.204.7-alpine3.13
217+
```
218+
> *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-`).*
219+
220+
**Linux distribution:** Alpine Linux v3.13
221+
222+
**Architectures:** linux/amd64, linux/arm64
223+
224+
**Available (non-root) user:** vscode
225+
226+
### Contents
227+
**Tools installed using git**
228+
229+
| Tool | Commit | Path |
230+
|------|--------|------|
231+
| [Oh My Zsh!](https://github.com/ohmyzsh/ohmyzsh) | 6d48309cd7da1b91038cf08be7865fb5bb9bc5ea | /home/vscode/.oh-my-zsh |
232+
233+
**Additional linux tools and packages**
234+
235+
| Tool / library | Version |
236+
|----------------|---------|
237+
| git | 2.30.5-r0 |
238+
| openssh-client | 8.4_p1-r4 |
239+
| gnupg | 2.2.31-r1 |
240+
| procps | 3.3.16-r0 |
241+
| lsof | 4.94.0-r0 |
242+
| htop | 3.0.5-r1 |
243+
| net-tools | 1.60_git20140218-r2 |
244+
| psmisc | 23.3-r0 |
245+
| curl | 7.79.1-r2 |
246+
| wget | 1.21.1-r1 |
247+
| rsync | 3.2.4-r0 |
248+
| ca-certificates | 20220614-r0 |
249+
| unzip | 6.0-r9 |
250+
| zip | 3.0-r9 |
251+
| nano | 5.4-r3 |
252+
| vim | 8.2.4836-r0 |
253+
| less | 563-r0 |
254+
| jq | 1.6-r1 |
255+
| libgcc | 10.2.1_pre1-r3 |
256+
| libstdc++ | 10.2.1_pre1-r3 |
257+
| krb5-libs | 1.18.5-r0 |
258+
| libintl | 0.20.2-r2 |
259+
| libssl1.1 | 1.1.1q-r0 |
260+
| lttng-ust | 2.12.0-r2 |
261+
| tzdata | 2022c-r0 |
262+
| userspace-rcu | 0.12.1-r0 |
263+
| zlib | 1.2.12-r3 |
264+
| sudo | 1.9.5p2-r0 |
265+
| coreutils | 8.32-r2 |
266+
| sed | 4.8-r0 |
267+
| grep | 3.7-r0 |
268+
| which | 2.21-r1 |
269+
| ncdu | 1.15.1-r0 |
270+
| shadow | 4.8.1-r0 |
271+
| strace | 5.10-r0 |
272+
| man-pages | 5.10-r0 |
273+

src/base-alpine/manifest.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2-
"version": "0.204.6",
2+
"version": "0.204.7",
33
"variants": [
4+
"3.16",
45
"3.15",
56
"3.14",
67
"3.13"
@@ -29,4 +30,4 @@
2930
"Oh My Zsh!": "/home/vscode/.oh-my-zsh"
3031
}
3132
}
32-
}
33+
}

0 commit comments

Comments
 (0)