Skip to content

Commit 3e64ffb

Browse files
samruddhikhandalesamruddhikhandale
authored
Node 14 - EOL (#553)
* Node 14 - EOL * fix build
1 parent 18cefbc commit 3e64ffb

File tree

8 files changed

+10
-83
lines changed

8 files changed

+10
-83
lines changed

‎build/src/prep.js‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,9 @@ async function prepDockerFile(devContainerDockerfilePath, definitionId, repo, re
8383
prepResult.devContainerDockerfileModified = replaceFrom(prepResult.devContainerDockerfileModified, `FROM ${prepResult.flattenedBaseImageTag}`);
8484
}
8585

86-
// Add variant & image_variant as an argument to the dockerfile
86+
// Add variant as an argument to the dockerfile
8787
if (variant) {
8888
replaceVariantArg(prepResult);
89-
replaceImageVariantEnv(prepResult);
9089
}
9190

9291
// Generate list of other arguments if applicable and add to the dockefile
@@ -248,13 +247,6 @@ function addBuildArguments(prepResult) {
248247
return prepResult.devContainerDockerfileModified;
249248
}
250249

251-
function replaceImageVariantEnv(prepResult) {
252-
const variantArg = `ENV IMAGE_VARIANT="${prepResult.meta.variant}"\n`;
253-
254-
prepResult.devContainerDockerfileModified = (prepResult.devContainerDockerfileModified).replace(new RegExp(".*ENV IMAGE_VARIANT=.*"), variantArg);
255-
return prepResult.devContainerDockerfileModified;
256-
}
257-
258250
module.exports = {
259251
createStub: createStub,
260252
updateStub: updateStub,

‎src/javascript-node/.devcontainer/Dockerfile‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 20, 18, 16, 14, 20-bullseye, 18-bullseye, 16-bullseye, 14-bullseye, 20-buster, 18-buster, 16-buster, 14-buster
1+
# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 20, 18, 16, 20-bullseye, 18-bullseye, 16-bullseye, 20-buster, 18-buster, 16-buster
22
ARG VARIANT=20-bullseye
33
FROM node:${VARIANT}
44

5-
ENV IMAGE_VARIANT="20-bullseye"
6-
7-
COPY library-scripts/add-patch.sh /tmp/library-scripts/
8-
RUN bash /tmp/library-scripts/add-patch.sh "${IMAGE_VARIANT}" && rm -rf /tmp/library-scripts
9-
105
ARG USERNAME=node
116
ARG NPM_GLOBAL=/usr/local/share/npm-global
127

‎src/javascript-node/.devcontainer/library-scripts/add-patch.sh‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎src/javascript-node/README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
| *Categories* | Core, Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published image* | mcr.microsoft.com/devcontainers/javascript-node |
12-
| *Available image variants* | 20 / 20-bullseye, 18 / 18-bullseye, 16 / 16-bullseye, 14 / 14-bullseye, 20-buster, 18-buster, 16-buster, 14-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/javascript-node/tags/list)) |
12+
| *Available image variants* | 20 / 20-bullseye, 18 / 18-bullseye, 16 / 16-bullseye, 20-buster, 18-buster, 16-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/javascript-node/tags/list)) |
1313
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian |
@@ -23,7 +23,6 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
2323
- `mcr.microsoft.com/devcontainers/javascript-node:20` (or `20-bullseye`, `20-buster` to pin to an OS version)
2424
- `mcr.microsoft.com/devcontainers/javascript-node:18` (or `18-bullseye`, `18-buster` to pin to an OS version)
2525
- `mcr.microsoft.com/devcontainers/javascript-node:16` (or `16-bullseye`, `16-buster` to pin to an OS version)
26-
- `mcr.microsoft.com/devcontainers/javascript-node:14` (or `14-bullseye`, `14-buster` to pin to an OS version)
2726

2827
Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
2928

‎src/javascript-node/manifest.json‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
"20-bullseye",
55
"18-bullseye",
66
"16-bullseye",
7-
"14-bullseye",
87
"20-buster",
98
"18-buster",
10-
"16-buster",
11-
"14-buster"
9+
"16-buster"
1210
],
1311
"build": {
1412
"latest": "20-bullseye",
@@ -26,10 +24,6 @@
2624
"linux/amd64",
2725
"linux/arm64"
2826
],
29-
"14-bullseye": [
30-
"linux/amd64",
31-
"linux/arm64"
32-
],
3327
"20-buster": [
3428
"linux/amd64"
3529
],
@@ -38,9 +32,6 @@
3832
],
3933
"16-buster": [
4034
"linux/amd64"
41-
],
42-
"14-buster": [
43-
"linux/amd64"
4435
]
4536
},
4637
"tags": [
@@ -57,9 +48,6 @@
5748
"16-bullseye": [
5849
"javascript-node:${VERSION}-16"
5950
],
60-
"14-bullseye": [
61-
"javascript-node:${VERSION}-14"
62-
],
6351
"20-buster": [
6452
"javascript-node:${VERSION}-buster"
6553
]

‎src/typescript-node/.devcontainer/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 20, 18, 16, 14, 20-bullseye, 18-bullseye, 16-bullseye, 14-bullseye, 20-buster, 18-buster, 16-buster, 14-buster
1+
# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 20, 18, 16, 20-bullseye, 18-bullseye, 16-bullseye, 20-buster, 18-buster, 16-buster
22
ARG VARIANT=20-bullseye
33
FROM mcr.microsoft.com/devcontainers/javascript-node:0-${VARIANT}
44

‎src/typescript-node/README.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
| *Categories* | Core, Languages |
1010
| *Image type* | Dockerfile |
1111
| *Published image* | mcr.microsoft.com/devcontainers/typescript-node |
12-
| *Available image variants* | 20 / 20-bullseye, 18 / 18-bullseye, 16 / 16-bullseye, 14 / 14-bullseye, 20-buster, 18-buster, 16-buster, 14-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/typescript-node/tags/list)) |
12+
| *Available image variants* | 20 / 20-bullseye, 18 / 18-bullseye, 16 / 16-bullseye, 20-buster, 18-buster, 16-buster ([full list](https://mcr.microsoft.com/v2/devcontainers/typescript-node/tags/list)) |
1313
| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bullseye` variants |
1414
| *Container host OS support* | Linux, macOS, Windows |
1515
| *Container OS* | Debian |
@@ -23,15 +23,14 @@ You can directly reference pre-built versions of `Dockerfile` by using the `imag
2323
- `mcr.microsoft.com/devcontainers/typescript-node:20` (or `20-bullseye`, `20-buster` to pin to an OS version)
2424
- `mcr.microsoft.com/devcontainers/typescript-node:18` (or `18-bullseye`, `18-buster` to pin to an OS version)
2525
- `mcr.microsoft.com/devcontainers/typescript-node:16` (or `16-bullseye`, `16-buster` to pin to an OS version)
26-
- `mcr.microsoft.com/devcontainers/typescript-node:14` (or `14-bullseye`, `14-buster` to pin to an OS version)
2726

2827
Refer to [this guide](https://containers.dev/guide/dockerfile) for more details.
2928

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

32-
- `mcr.microsoft.com/devcontainers/typescript-node:0-14` (or `0-14-bullseye`, `0-14-buster`)
33-
- `mcr.microsoft.com/devcontainers/typescript-node:0.204-14` (or `0.203-14-bullseye`, `0.203-14-buster`)
34-
- `mcr.microsoft.com/devcontainers/typescript-node:0.204.0-14` (or `0.203.0-14-bullseye`, `0.203.0-14-buster`)
31+
- `mcr.microsoft.com/devcontainers/typescript-node:0-20` (or `0-20-bullseye`, `0-20-buster`)
32+
- `mcr.microsoft.com/devcontainers/typescript-node:0.205-20` (or `0.205-20-bullseye`, `0.205-20-buster`)
33+
- `mcr.microsoft.com/devcontainers/typescript-node:0.205.1-20` (or `0.205.1-20-bullseye`, `0.205.1-20-buster`)
3534

3635
However, we only do security patching on the latest [non-breaking, in support](https://github.com/devcontainers/images/issues/90) versions of images (e.g. `0-1.16`). You may want to run `apt-get update && apt-get upgrade` in your Dockerfile if you lock to a more specific version to at least pick up OS security updates.
3736

‎src/typescript-node/manifest.json‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44
"20-bullseye",
55
"18-bullseye",
66
"16-bullseye",
7-
"14-bullseye",
87
"20-buster",
98
"18-buster",
10-
"16-buster",
11-
"14-buster"
9+
"16-buster"
1210
],
1311
"build": {
1412
"latest": "20-buster",
@@ -27,10 +25,6 @@
2725
"linux/amd64",
2826
"linux/arm64"
2927
],
30-
"14-bullseye": [
31-
"linux/amd64",
32-
"linux/arm64"
33-
],
3428
"20-buster": [
3529
"linux/amd64"
3630
],
@@ -39,9 +33,6 @@
3933
],
4034
"16-buster": [
4135
"linux/amd64"
42-
],
43-
"14-buster": [
44-
"linux/amd64"
4536
]
4637
},
4738
"tags": [
@@ -58,9 +49,6 @@
5849
"16-bullseye": [
5950
"typescript-node:${VERSION}-16"
6051
],
61-
"14-bullseye": [
62-
"typescript-node:${VERSION}-14"
63-
],
6452
"20-buster": [
6553
"typescript-node:${VERSION}-buster"
6654
]

0 commit comments

Comments
 (0)