Skip to content
This repository was archived by the owner on Nov 30, 2023. It is now read-only.

Commit 0c9e7cc

Browse files
committed
Switched templates to use comments given jsonc support
1 parent 1f71207 commit 0c9e7cc

File tree

9 files changed

+40
-42
lines changed

9 files changed

+40
-42
lines changed

.devcontainer/Dockerfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,16 @@ FROM debian:9
88

99
# Install git
1010
RUN apt-get update \
11-
&& apt-get install -y git
11+
&& apt-get install -y git procps lsb-release
1212

1313
# Install Docker CE CLI
14-
RUN apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common \
14+
RUN apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common lsb-release \
1515
&& curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | apt-key add - \
1616
&& add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" \
1717
&& apt-get update \
1818
&& apt-get install -y docker-ce-cli
1919

20-
2120
# Clean up
2221
RUN apt-get autoremove -y \
2322
&& apt-get clean -y \
24-
&& rm -rf /var/lib/apt/lists/*
25-
23+
&& rm -rf /var/lib/apt/lists/*

.devcontainer/devcontainer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
// "See https://aka.ms/vscode-remote/devcontainer.json for format details."
23
"name": "Dev Container Editing",
34
"dockerFile": "Dockerfile",
45
"extensions": [

container-templates/docker-compose/.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
# Debian and Ubuntu based images are supported. Alpine images are not yet supported.
1212
FROM debian:9
1313

14-
# Install git, process tools
15-
RUN apt-get update && apt-get -y install git procps
14+
# Install git, process tools, lsb-release (common in install instructions for CLIs)
15+
RUN apt-get update && apt-get -y install git procps lsb-release
1616

1717
# *****************************************************
1818
# * Add steps for installing needed dependencies here *
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{
2-
"name": "Dev Container Definition Template - Docker Compose",
2+
// "See https://aka.ms/vscode-remote/devcontainer.json for format details."
3+
"name": "Dev Container Definition Template - Docker Compose",
34
"dockerComposeFile": "docker-compose.yml",
45
"service": "your-service-name-here",
56
"workspaceFolder": "/workspace",
67
"shutdownAction": "stopCompose",
7-
"extensions": [
8-
"mutantdino.resourcemonitor"
8+
"extensions": [
9+
"mutantdino.resourcemonitor"
910
]
1011
}

container-templates/dockerfile/.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
# Debian and Ubuntu based images are supported. Alpine images are not yet supported.
77
FROM debian:9
88

9-
# Install git, process tools
10-
RUN apt-get update && apt-get -y install git procps
9+
# Install git, process tools, lsb-release (common in install instructions for CLIs)
10+
RUN apt-get update && apt-get -y install git procps lsb-release
1111

1212
# *****************************************************
1313
# * Add steps for installing needed dependencies here *
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
2-
"name": "Dev Container Definition Template - Dockerfile",
3-
"dockerFile": "Dockerfile",
4-
"appPort": 3000,
5-
"extensions": [
6-
"mutantdino.resourcemonitor"
2+
// "See https://aka.ms/vscode-remote/devcontainer.json for format details."
3+
"name": "Dev Container Definition Template - Dockerfile",
4+
"dockerFile": "Dockerfile",
5+
"appPort": 3000,
6+
"extensions": [
7+
"mutantdino.resourcemonitor"
78
],
8-
"runArgs": []
9+
"runArgs": []
910
}
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
2-
"name": "Dev Container Definition Template - Container Image",
3-
"image": "ubuntu:bionic",
4-
"appPort": 3000,
5-
"extensions": [
6-
"mutantdino.resourcemonitor"
2+
// "See https://aka.ms/vscode-remote/devcontainer.json for format details."
3+
"name": "Dev Container Definition Template - Container Image",
4+
"image": "ubuntu:bionic",
5+
"appPort": 3000,
6+
"extensions": [
7+
"mutantdino.resourcemonitor"
78
],
8-
"runArgs": []
9+
"runArgs": []
910
}
Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
{
2+
// "See https://aka.ms/vscode-remote/devcontainer.json for format details."
23
"name": "Existing Docker Compose (Extend)",
34

4-
"// Update the 'dockerComposeFile' list if you have more compose files or use different names.":"",
5-
"// The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.":"",
6-
5+
// "Update the 'dockerComposeFile' list if you have more compose files or use different names."
6+
// "The .devcontainer/docker-compose.yml file contains any overrides you need/want to make."
77
"dockerComposeFile": [
88
"../docker-compose.yml",
99
"docker-compose.yml"
1010
],
1111

12-
"// The 'service' property is the name of the service for the container that VS Code should":"",
13-
"// use. Update this value and .devcontainer/docker-compose.yml to the real service name.":"",
14-
12+
// "The 'service' property is the name of the service for the container that VS Code should"
13+
// "use. Update this value and .devcontainer/docker-compose.yml to the real service name."
1514
"service": "your-service-name-here",
1615

17-
"// The optional 'workspaceFolder' property is the path VS Code should open by default when":"",
18-
"// connected. This is typically a file mount in .devcontainer/docker-compose.yml":"",
19-
16+
// "The optional 'workspaceFolder' property is the path VS Code should open by default when"
17+
// "connected. This is typically a file mount in .devcontainer/docker-compose.yml"
2018
"workspaceFolder": "/workspace"
2119
}
Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
{
2+
// "See https://aka.ms/vscode-remote/devcontainer.json for format details."
23
"name": "Existing Dockerfile",
34

4-
"// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.":"",
5-
5+
// "Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename."
66
"dockerFile": "../Dockerfile",
77

8-
"// Use the optional 'appPort' property to expose ports not already in your Dockerfile":"",
9-
8+
// "Use the optional 'appPort' property to expose ports not already in your Dockerfile"
109
"appPort": [],
1110

12-
"// The optional 'runArgs' property can be used to specify Docker CLI arguments to use when the container.":"",
13-
"// is started. If you install the Docker CE CLI in your container, the runArgs list below will lets you interact":"",
14-
"// with your host's Docker service from inside the container. See the docker-in-docker and docker-in-docker-compose":"",
15-
"// definitions for details.":"",
16-
11+
// "The optional 'runArgs' property can be used to specify Docker CLI arguments to use when the container."
12+
// "is started. If you install the Docker CE CLI in your container, the runArgs list below will lets you interact"
13+
// "with your host's Docker service from inside the container. See the docker-in-docker and docker-in-docker-compose"
14+
// "definitions for details."
1715
"runArgs": ["-v","/var/run/docker.sock:/var/run/docker.sock"]
1816
}

0 commit comments

Comments
 (0)