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

Commit

Permalink
Fix tabs vs spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
Chuxel committed May 8, 2019
1 parent fd9f37e commit 1cc293b
Show file tree
Hide file tree
Showing 9 changed files with 128 additions and 123 deletions.
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[*.json]
indent_style = tab

[Dockerfile]
indent_style = spaces
indent_size = 4

[*.{yml,yaml}]
indent_style = spaces
indent_size = 2
32 changes: 16 additions & 16 deletions container-templates/docker-compose/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
"name": "Dev Container Definition Template - Docker Compose",
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
"name": "Dev Container Definition Template - Docker Compose",

// Update the 'dockerComposeFile' list if you have more compose files or use different names.
"dockerComposeFile": "docker-compose.yml",

// The 'service' property is the name of the service for the container that VS Code should
// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
"service": "your-service-name-here",
// Update the 'dockerComposeFile' list if you have more compose files or use different names.
"dockerComposeFile": "docker-compose.yml",

// The optional 'workspaceFolder' property is the path VS Code should open by default when
// connected. This is typically a volume mount in .devcontainer/docker-compose.yml
"workspaceFolder": "/workspace",
// The 'service' property is the name of the service for the container that VS Code should
// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
"service": "your-service-name-here",

// Add any extensions you want auto-installed here.
"extensions": [],
// The optional 'workspaceFolder' property is the path VS Code should open by default when
// connected. This is typically a volume mount in .devcontainer/docker-compose.yml
"workspaceFolder": "/workspace",

// Update the value of this line like to 'none' if you want to keep your containers running after VS Code shuts down.
"shutdownAction": "stopCompose"
}
// Add any extensions you want auto-installed here.
"extensions": [],

// Update the value of this line like to 'none' if you want to keep your containers running after VS Code shuts down.
"shutdownAction": "stopCompose"
}
37 changes: 18 additions & 19 deletions container-templates/dockerfile/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
{
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
"name": "Dev Container Definition Template - Dockerfile",
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
"name": "Dev Container Definition Template - Dockerfile",

// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
"dockerFile": "Dockerfile",

// Use the optional 'appPort' property to expose ports not already in your Dockerfile
"appPort": [],

// Add any extensions you want auto-installed here.
"extensions": [],
// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
"dockerFile": "Dockerfile",

// The optional 'runArgs' property can be used to specify additional runtime arguments.
"runArgs": [
// Uncomment the next line if you want to use Docker from the container. See the docker-in-docker definition for details.
// "-v","/var/run/docker.sock:/var/run/docker.sock",
// Use the optional 'appPort' property to expose ports not already in your Dockerfile
"appPort": [],

// Uncomment the next two lines if you will use a ptrace-based debugger like C++, Go, and Rust
// "--cap-add=SYS_PTRACE",
// "--security-opt", "seccomp=unconfined"
]
}
// Add any extensions you want auto-installed here.
"extensions": [],

// The optional 'runArgs' property can be used to specify additional runtime arguments.
"runArgs": [
// Uncomment the next line if you want to use Docker from the container. See the docker-in-docker definition for details.
// "-v","/var/run/docker.sock:/var/run/docker.sock",
// Uncomment the next two lines if you will use a ptrace-based debugger like C++, Go, and Rust
// "--cap-add=SYS_PTRACE",
// "--security-opt", "seccomp=unconfined"
]
}
38 changes: 18 additions & 20 deletions container-templates/image/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
{
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
"name": "Dev Container Definition Template - Container Image",
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
"name": "Dev Container Definition Template - Container Image",

// Update the 'image' property with your Docker image name.
"image": "ubuntu:bionic",

// Use the optional 'appPort' property to expose ports not already in your Dockerfile
"appPort": [],

// Add any extensions you want auto-installed here.
"extensions": [],
// Update the 'image' property with your Docker image name.
"image": "ubuntu:bionic",

// The optional 'runArgs' property can be used to specify additional runtime arguments.
"runArgs": [
// Uncomment the next line if you want to use Docker from the container. See the docker-in-docker definition for details.
// "-v","/var/run/docker.sock:/var/run/docker.sock",
// Use the optional 'appPort' property to expose ports not already in your Dockerfile
"appPort": [],

// Uncomment the next two lines if you will use a ptrace-based debugger like C++, Go, and Rust.
// "--cap-add=SYS_PTRACE",
// "--security-opt", "seccomp=unconfined"
]

}
// Add any extensions you want auto-installed here.
"extensions": [],

// The optional 'runArgs' property can be used to specify additional runtime arguments.
"runArgs": [
// Uncomment the next line if you want to use Docker from the container. See the docker-in-docker definition for details.
// "-v","/var/run/docker.sock:/var/run/docker.sock",
// Uncomment the next two lines if you will use a ptrace-based debugger like C++, Go, and Rust.
// "--cap-add=SYS_PTRACE",
// "--security-opt", "seccomp=unconfined"
]
}
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
// "See https://aka.ms/vscode-remote/devcontainer.json for format details."
"name": "Existing Docker Compose (Extend)",
// "See https://aka.ms/vscode-remote/devcontainer.json for format details."
"name": "Existing Docker Compose (Extend)",

// "Update the 'dockerComposeFile' list if you have more compose files or use different names."
// "The .devcontainer/docker-compose.yml file contains any overrides you need/want to make."
"dockerComposeFile": [
"../docker-compose.yml",
"docker-compose.yml"
],

// "The 'service' property is the name of the service for the container that VS Code should"
// "use. Update this value and .devcontainer/docker-compose.yml to the real service name."
"service": "your-service-name-here",
// "Update the 'dockerComposeFile' list if you have more compose files or use different names."
// "The .devcontainer/docker-compose.yml file contains any overrides you need/want to make."
"dockerComposeFile": [
"../docker-compose.yml",
"docker-compose.yml"
],

// "The optional 'workspaceFolder' property is the path VS Code should open by default when"
// "connected. This is typically a file mount in .devcontainer/docker-compose.yml"
"workspaceFolder": "/workspace",
// "The 'service' property is the name of the service for the container that VS Code should"
// "use. Update this value and .devcontainer/docker-compose.yml to the real service name."
"service": "your-service-name-here",

// "Add any extensions you want auto-installed here."
"extensions": [],
// "The optional 'workspaceFolder' property is the path VS Code should open by default when"
// "connected. This is typically a file mount in .devcontainer/docker-compose.yml"
"workspaceFolder": "/workspace",

// "Update the value of this line like to 'none' if you want to keep your containers running after VS Code shuts down."
"shutdownAction": "stopCompose"
}
// "Add any extensions you want auto-installed here."
"extensions": [],

// "Update the value of this line like to 'none' if you want to keep your containers running after VS Code shuts down."
"shutdownAction": "stopCompose"
}
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
{
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
"name": "Existing Dockerfile",
// See https://aka.ms/vscode-remote/devcontainer.json for format details.
"name": "Existing Dockerfile",

// Sets the run context to one level up instead of the .devcontainer folder.
"context": "..",
// Sets the run context to one level up instead of the .devcontainer folder.
"context": "..",

// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
"dockerFile": "Dockerfile",

// Use the optional 'appPort' property to expose ports not already in your Dockerfile
"appPort": [],

// Add any extensions you want auto-installed here.
"extensions": [],
// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
"dockerFile": "Dockerfile",

// The optional 'runArgs' property can be used to specify additional runtime arguments.
"runArgs": [
// Uncomment the next line if you want to use Docker from the container. See the docker-in-docker definition for details.
// "-v","/var/run/docker.sock:/var/run/docker.sock",
// Use the optional 'appPort' property to expose ports not already in your Dockerfile
"appPort": [],

// Uncomment the next two lines if you will be using a ptrace-based debugger like C++, Go, and Rust.
// "--cap-add=SYS_PTRACE",
// "--security-opt", "seccomp=unconfined"
]
}
// Add any extensions you want auto-installed here.
"extensions": [],

// The optional 'runArgs' property can be used to specify additional runtime arguments.
"runArgs": [
// Uncomment the next line if you want to use Docker from the container. See the docker-in-docker definition for details.
// "-v","/var/run/docker.sock:/var/run/docker.sock",
// Uncomment the next two lines if you will be using a ptrace-based debugger like C++, Go, and Rust.
// "--cap-add=SYS_PTRACE",
// "--security-opt", "seccomp=unconfined"
]
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "Docker in Docker Compose",
"dockerComposeFile": "docker-compose.yml",
"service": "docker-in-docker",
"workspaceFolder": "/workspace",
"shutdownAction": "stopCompose",
"extensions": [
"peterjausovec.vscode-docker"
]
}
"name": "Docker in Docker Compose",
"dockerComposeFile": "docker-compose.yml",
"service": "docker-in-docker",
"workspaceFolder": "/workspace",
"shutdownAction": "stopCompose",
"extensions": [
"peterjausovec.vscode-docker"
]
}
25 changes: 12 additions & 13 deletions containers/docker-in-docker/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
{
"name": "Docker in Docker",
"dockerFile": "Dockerfile",
"extensions": [
"peterjausovec.vscode-docker"
],
"runArgs": [
"-v","/var/run/docker.sock:/var/run/docker.sock",

// Uncomment the next two lines if you will use a ptrace-based debugger like C++, Go, and Rust.
// "--cap-add=SYS_PTRACE",
// "--security-opt", "seccomp=unconfined"
]
}
"name": "Docker in Docker",
"dockerFile": "Dockerfile",
"extensions": [
"peterjausovec.vscode-docker"
],
"runArgs": [
"-v", "/var/run/docker.sock:/var/run/docker.sock",
// Uncomment the next two lines if you will use a ptrace-based debugger like C++, Go, and Rust.
// "--cap-add=SYS_PTRACE",
// "--security-opt", "seccomp=unconfined"
]
}
10 changes: 5 additions & 5 deletions containers/ubuntu-18.04-git/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"name": "Ubuntu 18.04 & Git",
"dockerFile": "Dockerfile",
"appPort": [],
"runArgs": [
// Uncomment the next two lines if you will use a ptrace-based debugger like C++, Go, and Rust.
// "--cap-add=SYS_PTRACE",
// "--security-opt", "seccomp=unconfined"
]
"runArgs": [
// Uncomment the next two lines if you will use a ptrace-based debugger like C++, Go, and Rust.
// "--cap-add=SYS_PTRACE",
// "--security-opt", "seccomp=unconfined"
]
}

0 comments on commit 1cc293b

Please sign in to comment.