Skip to content

Commit

Permalink
Node templates: Add debian:bookworm options & remove the ones without…
Browse files Browse the repository at this point in the history
… OS bit (#172)

* Node templates: Support debian:bookworm

* #174

* use bullseye as default

* Update devcontainer.json
  • Loading branch information
samruddhikhandale authored Jun 23, 2023
1 parent 1dcd0f7 commit 6b6520c
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 40 deletions.
15 changes: 7 additions & 8 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"image": "mcr.microsoft.com/devcontainers/javascript-node:0-18",
"image": "mcr.microsoft.com/devcontainers/javascript-node:1-18-bullseye",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
},
"postCreateCommand": "npm install -g @devcontainers/cli",
"customizations": {
"vscode": {
"extensions": [
Expand All @@ -8,10 +12,5 @@
"editorconfig.editorconfig"
]
}
},
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
},
"postCreateCommand": "npm install -g @devcontainers/cli",
"remoteUser": "node"
}
}
}
2 changes: 1 addition & 1 deletion src/docker-in-docker/NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ For this technique to work, the "Docker in Docker" Feature included in this temp
The included `.devcontainer.json` can be altered to work with other Debian/Ubuntu-based container images such as `node` or `python`. For example, to use `mcr.microsoft.com/devcontainers/javascript-node`, update the `image` proprty as follows:

```json
"image": "mcr.microsoft.com/devcontainers/javascript-node:18"
"image": "mcr.microsoft.com/devcontainers/javascript-node:18-bullseye"
```
2 changes: 1 addition & 1 deletion src/docker-outside-of-docker-compose/NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This example illustrates how you can do this by running CLI commands and using t
The included `.devcontainer/Dockerfile` can be altered to work with other Debian/Ubuntu-based container images such as `node` or `python`.

```Dockerfile
FROM mcr.microsoft.com/devcontainers/javascript-node:18
FROM mcr.microsoft.com/devcontainers/javascript-node:18-bullseye
```

## Using bind mounts when working with Docker inside the container
Expand Down
2 changes: 1 addition & 1 deletion src/docker-outside-of-docker/NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This example illustrates how you can do this by running CLI commands and using t
The included `.devcontainer.json` can be altered to work with other Debian/Ubuntu-based container images such as `node` or `python`. For example, to use `mcr.microsoft.com/devcontainers/javascript-node`, update the `image` proprty as follows:

```json
"image": "mcr.microsoft.com/devcontainers/javascript-node:18"
"image": "mcr.microsoft.com/devcontainers/javascript-node:18-bullseye"
```

## Using bind mounts when working with Docker inside the container
Expand Down
2 changes: 1 addition & 1 deletion src/javascript-node-postgres/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/devcontainers/javascript-node:0-${templateOption:imageVariant}
FROM mcr.microsoft.com/devcontainers/javascript-node:1-${templateOption:imageVariant}

# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
Expand Down
17 changes: 7 additions & 10 deletions src/javascript-node-postgres/devcontainer-template.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "javascript-node-postgres",
"version": "1.2.0",
"version": "2.0.0",
"name": "Node.js & PostgreSQL",
"description": "Develop applications in Node.js and PostgreSQL. Includes Node.js, eslint, and yarn in a container linked to a Postgres DB container",
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/javascript-node-postgres",
Expand All @@ -9,22 +9,19 @@
"options": {
"imageVariant": {
"type": "string",
"description": "Node.js version (use -bullseye variants on local arm64/Apple Silicon):",
"description": "Node.js version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
"proposals": [
"20",
"18",
"16",
"14",
"20-bookworm",
"18-bookworm",
"16-bookworm",
"20-bullseye",
"18-bullseye",
"16-bullseye",
"14-bullseye",
"20-buster",
"18-buster",
"16-buster",
"14-buster"
"16-buster"
],
"default": "20"
"default": "20-bullseye"
}
},
"platforms": [
Expand Down
2 changes: 1 addition & 1 deletion src/javascript-node/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "Node.js",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/javascript-node:0-${templateOption:imageVariant}"
"image": "mcr.microsoft.com/devcontainers/javascript-node:1-${templateOption:imageVariant}"

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
Expand Down
12 changes: 6 additions & 6 deletions src/javascript-node/devcontainer-template.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "javascript-node",
"version": "1.2.1",
"version": "2.0.0",
"name": "Node.js & JavaScript",
"description": "Develop Node.js based applications. Includes Node.js, eslint, nvm, and yarn.",
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/javascript-node",
Expand All @@ -9,19 +9,19 @@
"options": {
"imageVariant": {
"type": "string",
"description": "Node.js version (use -bullseye variants on local arm64/Apple Silicon):",
"description": "Node.js version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
"proposals": [
"20",
"18",
"16",
"20-bookworm",
"18-bookworm",
"16-bookworm",
"20-bullseye",
"18-bullseye",
"16-bullseye",
"20-buster",
"18-buster",
"16-buster"
],
"default": "20"
"default": "20-bullseye"
}
},
"platforms": [
Expand Down
2 changes: 1 addition & 1 deletion src/kubernetes-helm-minikube/NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This example illustrates how you can do this by using CLIs ([kubectl](https://ku
The included `.devcontainer.json` can be altered to work with other Debian/Ubuntu-based container images such as `node` or `python`. For example, to use `mcr.microsoft.com/devcontainers/javascript-node`, update the `image` proprty as follows:

```json
"image": "mcr.microsoft.com/devcontainers/javascript-node:18"
"image": "mcr.microsoft.com/devcontainers/javascript-node:18-bullseye"
```


Expand Down
2 changes: 1 addition & 1 deletion src/kubernetes-helm/NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Dev containers can be useful for all types of applications including those that
The included `.devcontainer.json` can be altered to work with other Debian/Ubuntu-based container images such as `node` or `python`. For example, to use `mcr.microsoft.com/devcontainers/javascript-node`, update the `image` proprty as follows:

```json
"image": "mcr.microsoft.com/devcontainers/javascript-node:18"
"image": "mcr.microsoft.com/devcontainers/javascript-node:18-bullseye"
```


Expand Down
2 changes: 1 addition & 1 deletion src/typescript-node/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "Node.js & TypeScript",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/typescript-node:0-${templateOption:imageVariant}"
"image": "mcr.microsoft.com/devcontainers/typescript-node:1-${templateOption:imageVariant}"

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
Expand Down
16 changes: 8 additions & 8 deletions src/typescript-node/devcontainer-template.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "typescript-node",
"version": "1.2.1",
"version": "2.0.0",
"name": "Node.js & TypeScript",
"description": "Develop Node.js based applications in TypeScript. Includes Node.js, eslint, nvm, yarn, and the TypeScript compiler.",
"documentationURL": "https://github.com/devcontainers/templates/tree/main/src/typescript-node",
Expand All @@ -9,19 +9,19 @@
"options": {
"imageVariant": {
"type": "string",
"description": "Node.js version (use -bullseye variants on local arm64/Apple Silicon):",
"description": "Node.js version (use -bookworm, -bullseye variants on local arm64/Apple Silicon):",
"proposals": [
"20",
"18",
"16",
"20-bullseye",
"20-bookworm",
"18-bookworm",
"16-bookworm",
"20-bullseye",
"18-bullseye",
"16-bullseye",
"20-buster",
"20-buster",
"18-buster",
"16-buster"
],
"default": "20"
"default": "20-bullseye"
}
},
"platforms": [
Expand Down

0 comments on commit 6b6520c

Please sign in to comment.