Skip to content

Commit 22b654d

Browse files
Copilotabdurriq
Copilot
and
abdurriq
committed
Fix JSON indentation to preserve original formatting
Co-authored-by: abdurriq <[email protected]>
1 parent 6345e9d commit 22b654d

14 files changed

Lines changed: 698 additions & 508 deletions

‎src/anaconda/devcontainer-feature.json‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
{
2-
"id": "anaconda",
3-
"version": "1.2.0",
4-
"name": "Anaconda",
5-
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda",
6-
"options": {
7-
"version": {
8-
"type": "string",
9-
"proposals": [
10-
"latest"
11-
],
12-
"default": "latest",
13-
"description": "Select or enter an anaconda version."
14-
}
15-
},
16-
"containerEnv": {
17-
"CONDA_DIR": "/usr/local/conda",
18-
"PATH": "/usr/local/conda/bin:${PATH}"
19-
},
20-
"customizations": {
21-
"vscode": {
22-
"settings": {
23-
"github.copilot.chat.codeGeneration.instructions": [
24-
{
25-
"text": "This dev container includes Anaconda and the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
26-
}
27-
]
28-
}
29-
}
30-
},
31-
"installsAfter": [
32-
"ghcr.io/devcontainers/features/common-utils"
33-
]
2+
"id": "anaconda",
3+
"version": "1.2.0",
4+
"name": "Anaconda",
5+
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/anaconda",
6+
"options": {
7+
"version": {
8+
"type": "string",
9+
"proposals": [
10+
"latest"
11+
],
12+
"default": "latest",
13+
"description": "Select or enter an anaconda version."
14+
}
15+
},
16+
"containerEnv": {
17+
"CONDA_DIR": "/usr/local/conda",
18+
"PATH": "/usr/local/conda/bin:${PATH}"
19+
},
20+
"customizations": {
21+
"vscode": {
22+
"settings": {
23+
"github.copilot.chat.codeGeneration.instructions": [
24+
{
25+
"text": "This dev container includes Anaconda and the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
26+
}
27+
]
28+
}
29+
}
30+
},
31+
"installsAfter": [
32+
"ghcr.io/devcontainers/features/common-utils"
33+
]
3434
}

‎src/common-utils/devcontainer-feature.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"id": "common-utils",
3+
<<<<<<< HEAD
34
"version": "2.5.7",
5+
=======
6+
"version": "2.6.0",
7+
>>>>>>> 997feb3 (Fix JSON indentation to preserve original formatting)
48
"name": "Common Utilities",
59
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
610
"description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",

‎src/conda/devcontainer-feature.json‎

Lines changed: 43 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
<<<<<<< HEAD
23
"id": "conda",
34
"version": "1.2.5",
45
"name": "Conda",
@@ -14,30 +15,47 @@
1415
],
1516
"default": "latest",
1617
"description": "Select or enter a conda version."
18+
=======
19+
"id": "conda",
20+
"version": "1.1.0",
21+
"name": "Conda",
22+
"description": "A cross-platform, language-agnostic binary package manager",
23+
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/conda",
24+
"options": {
25+
"version": {
26+
"type": "string",
27+
"proposals": [
28+
"latest",
29+
"4.11.0",
30+
"4.12.0"
31+
],
32+
"default": "latest",
33+
"description": "Select or enter a conda version."
34+
},
35+
"addCondaForge": {
36+
"type": "boolean",
37+
"default": false,
38+
"description": "Add conda-forge channel to the config?"
39+
}
40+
>>>>>>> 997feb3 (Fix JSON indentation to preserve original formatting)
1741
},
18-
"addCondaForge": {
19-
"type": "boolean",
20-
"default": false,
21-
"description": "Add conda-forge channel to the config?"
22-
}
23-
},
24-
"containerEnv": {
25-
"CONDA_DIR": "/opt/conda",
26-
"CONDA_SCRIPT": "/opt/conda/etc/profile.d/conda.sh",
27-
"PATH": "/opt/conda/bin:${PATH}"
28-
},
29-
"customizations": {
30-
"vscode": {
31-
"settings": {
32-
"github.copilot.chat.codeGeneration.instructions": [
33-
{
34-
"text": "This dev container includes the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
35-
}
36-
]
37-
}
38-
}
39-
},
40-
"installsAfter": [
41-
"ghcr.io/devcontainers/features/common-utils"
42-
]
42+
"containerEnv": {
43+
"CONDA_DIR": "/opt/conda",
44+
"CONDA_SCRIPT": "/opt/conda/etc/profile.d/conda.sh",
45+
"PATH": "/opt/conda/bin:${PATH}"
46+
},
47+
"customizations": {
48+
"vscode": {
49+
"settings": {
50+
"github.copilot.chat.codeGeneration.instructions": [
51+
{
52+
"text": "This dev container includes the conda package manager pre-installed and available on the `PATH` for data science and Python development. Additional packages installed using Conda will be downloaded from Anaconda or another repository configured by the user. A user can install different versions of Python than the one in this dev container by running a command like: conda install python=3.7"
53+
}
54+
]
55+
}
56+
}
57+
},
58+
"installsAfter": [
59+
"ghcr.io/devcontainers/features/common-utils"
60+
]
4361
}

‎src/desktop-lite/devcontainer-feature.json‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,71 @@
11
{
2-
"id": "desktop-lite",
3-
"version": "1.3.0",
4-
"name": "Light-weight Desktop",
5-
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
6-
"description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
7-
"options": {
8-
"version": {
9-
"type": "string",
10-
"proposals": [
11-
"latest"
12-
],
13-
"default": "latest",
14-
"description": "Currently Unused!"
2+
"id": "desktop-lite",
3+
"version": "1.3.0",
4+
"name": "Light-weight Desktop",
5+
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/desktop-lite",
6+
"description": "Adds a lightweight Fluxbox based desktop to the container that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS code terminal will open on the desktop automatically.",
7+
"options": {
8+
"version": {
9+
"type": "string",
10+
"proposals": [
11+
"latest"
12+
],
13+
"default": "latest",
14+
"description": "Currently Unused!"
15+
},
16+
"noVncVersion": {
17+
"type": "string",
18+
"proposals": [
19+
"1.6.0"
20+
],
21+
"default": "1.6.0",
22+
"description": "The noVNC version to use"
23+
},
24+
"password": {
25+
"type": "string",
26+
"proposals": [
27+
"vscode",
28+
"codespaces",
29+
"password",
30+
"noPassword"
31+
],
32+
"default": "vscode",
33+
"description": "Enter a password for desktop connections. If \"noPassword\", connections from the local host can be established without entering a password"
34+
},
35+
"webPort": {
36+
"type": "string",
37+
"proposals": [
38+
"6080"
39+
],
40+
"default": "6080",
41+
"description": "Enter a port for the VNC web client (noVNC)"
42+
},
43+
"vncPort": {
44+
"type": "string",
45+
"proposals": [
46+
"5901"
47+
],
48+
"default": "5901",
49+
"description": "Enter a port for the desktop VNC server (TigerVNC)"
50+
}
1551
},
16-
"noVncVersion": {
17-
"type": "string",
18-
"proposals": [
19-
"1.6.0"
20-
],
21-
"default": "1.6.0",
22-
"description": "The noVNC version to use"
52+
"init": true,
53+
"entrypoint": "/usr/local/share/desktop-init.sh",
54+
"containerEnv": {
55+
"DISPLAY": ":1"
2356
},
24-
"password": {
25-
"type": "string",
26-
"proposals": [
27-
"vscode",
28-
"codespaces",
29-
"password",
30-
"noPassword"
31-
],
32-
"default": "vscode",
33-
"description": "Enter a password for desktop connections. If \"noPassword\", connections from the local host can be established without entering a password"
57+
"customizations": {
58+
"vscode": {
59+
"settings": {
60+
"github.copilot.chat.codeGeneration.instructions": [
61+
{
62+
"text": "This dev container includes a lightweight Fluxbox based desktop that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS Code terminal will open on the desktop automatically."
63+
}
64+
]
65+
}
66+
}
3467
},
35-
"webPort": {
36-
"type": "string",
37-
"proposals": [
38-
"6080"
39-
],
40-
"default": "6080",
41-
"description": "Enter a port for the VNC web client (noVNC)"
42-
},
43-
"vncPort": {
44-
"type": "string",
45-
"proposals": [
46-
"5901"
47-
],
48-
"default": "5901",
49-
"description": "Enter a port for the desktop VNC server (TigerVNC)"
50-
}
51-
},
52-
"init": true,
53-
"entrypoint": "/usr/local/share/desktop-init.sh",
54-
"containerEnv": {
55-
"DISPLAY": ":1"
56-
},
57-
"customizations": {
58-
"vscode": {
59-
"settings": {
60-
"github.copilot.chat.codeGeneration.instructions": [
61-
{
62-
"text": "This dev container includes a lightweight Fluxbox based desktop that can be accessed using a VNC viewer or the web. GUI-based commands executed from the built-in VS Code terminal will open on the desktop automatically."
63-
}
64-
]
65-
}
66-
}
67-
},
68-
"installsAfter": [
69-
"ghcr.io/devcontainers/features/common-utils"
70-
]
68+
"installsAfter": [
69+
"ghcr.io/devcontainers/features/common-utils"
70+
]
7171
}

0 commit comments

Comments
 (0)