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

Commit

Permalink
Container fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Chuxel committed Mar 22, 2019
1 parent c7be63f commit f5678fb
Show file tree
Hide file tree
Showing 14 changed files with 44 additions and 21 deletions.
2 changes: 0 additions & 2 deletions container-templates/docker-compose/.vscode/devContainer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"name": "Dev Container Definition Template - Docker Compose",
"dockerComposeFile": "docker-compose.dev-container.yml",
"appPort": 3000,
"devPort": 8000,
"service": "your-service-name-here",
"volume": "app",
"extensions": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ services:
dockerfile: dev-container.dockerfile # Using a Dockerfile is optional, but included for completeness.

ports:
- "3000:3000" # Application port to forward, value of "appPort" in .vscode/devContainer.json
- "8000:8000" # Port VS Code Remote server should use to communicate with VS Code, value of "devPort" in .vscode/devContainer.json

- "3000:3000" # Application port to forward

volumes:
- .:/app # This is where VS Code should expect to find your project's source code, value of "volume" in .vscode/devContainer.json

Expand Down
2 changes: 0 additions & 2 deletions containers/node-8-mongo/.vscode/devContainer.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"name": "Node.js & Mongo DB",
"dockerComposeFile": "docker-compose.dev-container.yml",
"appPort": 3000,
"devPort": 8000,
"service": "app",
"volume": "app",
"extensions": [
Expand Down
7 changes: 2 additions & 5 deletions containers/node-8-mongo/docker-compose.dev-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,15 @@ services:
build:
context: .
dockerfile: dev-container.dockerfile
ports:
- "3000:3000"
- "8000:8000"
volumes:
- .:/app
ports:
- "3000:3000"
command: sleep infinity
links:
- mongo
mongo:
image: mongo
ports:
- "27017:27017"
volumes:
- /data/db

2 changes: 0 additions & 2 deletions containers/node-8-mongo/test-project/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ services:
- mongo
mongo:
image: mongo
ports:
- "27017:27017"
volumes:
- /data/db

3 changes: 1 addition & 2 deletions containers/python-2/.vscode/devContainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "Python",
"name": "Python 2",
"dockerFile": "dev-container.dockerfile",
"appPort": 8989,
"extensions": [
"ms-python.python"
]
Expand Down
15 changes: 15 additions & 0 deletions containers/python-2/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Python: Current File (Integrated Terminal)",
"type": "python",
"request": "launch",
"program": "${file}",
"console": "integratedTerminal"
}
]
}
3 changes: 3 additions & 0 deletions containers/python-2/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"python.pythonPath": "/usr/local/bin/python"
}
2 changes: 1 addition & 1 deletion containers/python-2/dev-container.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN pip install pylint
RUN apt-get update && apt-get -y install git

# Install any missing dependencies for enhanced language service
RUN apt-get install libicu
RUN apt-get install libicu57

# Clean up
RUN apt-get autoremove -y \
Expand Down
1 change: 0 additions & 1 deletion containers/python-3-redis/docker-compose.dev-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ services:
dockerfile: dev-container.dockerfile
ports:
- "5000:5000"
- "8000:8000"
volumes:
- .:/app
command: sleep infinity
Expand Down
3 changes: 1 addition & 2 deletions containers/python-3/.vscode/devContainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "Python",
"name": "Python 3",
"dockerFile": "dev-container.dockerfile",
"appPort": 8989,
"extensions": [
"ms-python.python"
]
Expand Down
15 changes: 15 additions & 0 deletions containers/python-3/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Python: Current File (Integrated Terminal)",
"type": "python",
"request": "launch",
"program": "${file}",
"console": "integratedTerminal"
}
]
}
3 changes: 3 additions & 0 deletions containers/python-3/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"python.linting.pylintEnabled": true
}
2 changes: 1 addition & 1 deletion containers/python-3/dev-container.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN pip install pylint
RUN apt-get update && apt-get -y install git

# Install any missing dependencies for enhanced language service
RUN apt-get install libicu
RUN apt-get install libicu57

# Clean up
RUN apt-get autoremove -y \
Expand Down

0 comments on commit f5678fb

Please sign in to comment.