From 64bff0f97f3b6a6f5bc88e427bfbf192f20209d7 Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Mon, 1 Apr 2019 19:16:54 -0700 Subject: [PATCH] Fixes --- README.md | 10 ---------- .../.devcontainer/docker-compose.yml | 7 ++++++- .../.devcontainer/docker-compose.yml | 4 ++-- .../.devcontainer/docker-compose.yml | 4 ++-- containers/python-2/.devcontainer/Dockerfile | 2 +- containers/python-3-django/.devcontainer/Dockerfile | 3 +++ .../python-3-django/.devcontainer/settings.vscode.json | 4 ++++ .../python-3-flask-redis/.devcontainer/Dockerfile | 5 ++++- .../.devcontainer/docker-compose.yml | 2 +- .../.devcontainer/settings.vscode.json | 3 +++ containers/python-3-flask-redis/.vscode/settings.json | 2 +- .../python-3-jupyter-pyspark/.devcontainer/Dockerfile | 4 ++-- .../.devcontainer/docker-compose.yml | 4 ++-- containers/python-3/.devcontainer/Dockerfile | 3 +++ containers/python-3/.devcontainer/settings.vscode.json | 3 +++ 15 files changed, 37 insertions(+), 23 deletions(-) create mode 100644 containers/python-3-django/.devcontainer/settings.vscode.json create mode 100644 containers/python-3-flask-redis/.devcontainer/settings.vscode.json create mode 100644 containers/python-3/.devcontainer/settings.vscode.json diff --git a/README.md b/README.md index 02300aa27e..8ee3f468b6 100644 --- a/README.md +++ b/README.md @@ -62,16 +62,6 @@ The other definitions in the `containers` folder will provide examples of how to You can easily share a customized dev container definition for your project by simply adding files like `.vscode/devContainer.json` to source control. By including these files in your repository, anyone that opens a local copy of your repo in VS Code will be automatically asked if they want reopen the folder in a container instead if the [Remote Development](https://aka.ms/vscode-remote/download/extension) extension installed. -You can also have VS Code prompt anyone opening your repo to install the Remote Development extension. Simply add the extension ID to `recommendations` array in `.vscode/extensions.json` (as described [here](https://code.visualstudio.com/docs/editor/extension-gallery#_workspace-recommended-extensions)) and then add the file to source control. - -```json -{ - "recommendations": [ - "vscode.remote-development" - ] -} -``` - Beyond the advantages of having your team use a consistent environment and tool-chain, doing this can make it easier for new contributors or team members to get productive quickly. First-time contributors will require less guidance and are less likely to either submit issues or contribute code with issues that are related to environment setup. ## Contents diff --git a/containers/docker-existing-docker-compose/.devcontainer/docker-compose.yml b/containers/docker-existing-docker-compose/.devcontainer/docker-compose.yml index 79997ed202..69b77c3394 100644 --- a/containers/docker-existing-docker-compose/.devcontainer/docker-compose.yml +++ b/containers/docker-existing-docker-compose/.devcontainer/docker-compose.yml @@ -7,9 +7,14 @@ version: '3' services: # Update this to the name of the service you want to work with in your docker-compose.yml file your-service-name-here: + # Uncomment if you want to add a different Dockerfile in the .devcontainer folder + # build: + # context: . + # dockerfile: Dockerfile + volumes: # Update this to wherever you want VS Code to mount the folder of your project - - .:/workspace + - ..:/workspace # Forwarding the socket is optional, but lets docker work inside the container if you install the Docker CLI. # See the docker-in-docker-compose definition for details on how to install it. diff --git a/containers/docker-in-docker-compose/.devcontainer/docker-compose.yml b/containers/docker-in-docker-compose/.devcontainer/docker-compose.yml index f9b0697446..ccecaf593a 100644 --- a/containers/docker-in-docker-compose/.devcontainer/docker-compose.yml +++ b/containers/docker-in-docker-compose/.devcontainer/docker-compose.yml @@ -8,9 +8,9 @@ services: docker-in-docker: build: context: . - dockerfile: .devcontainer/Dockerfile + dockerfile: Dockerfile volumes: - - .:/workspace + - ..:/workspace # Forwarding the socket is the key to getting this to work - /var/run/docker.sock:/var/run/docker.sock diff --git a/containers/javascript-node-8-mongo/.devcontainer/docker-compose.yml b/containers/javascript-node-8-mongo/.devcontainer/docker-compose.yml index d21c32fbd5..7bf6f428ed 100644 --- a/containers/javascript-node-8-mongo/.devcontainer/docker-compose.yml +++ b/containers/javascript-node-8-mongo/.devcontainer/docker-compose.yml @@ -8,9 +8,9 @@ services: web: build: context: . - dockerfile: .devcontainer/Dockerfile + dockerfile: Dockerfile volumes: - - .:/app + - ..:/app ports: - "3000:3000" command: sleep infinity diff --git a/containers/python-2/.devcontainer/Dockerfile b/containers/python-2/.devcontainer/Dockerfile index 95e86fef8c..a9bb865124 100644 --- a/containers/python-2/.devcontainer/Dockerfile +++ b/containers/python-2/.devcontainer/Dockerfile @@ -6,7 +6,7 @@ FROM python:2-slim # Copy endpoint specific user settings overrides into container to specify Python path -COPY settings.vscode.json /root/.vscode-remote/data/User/settings.json +COPY .devcontainer/settings.vscode.json /root/.vscode-remote/data/User/settings.json RUN pip install pylint diff --git a/containers/python-3-django/.devcontainer/Dockerfile b/containers/python-3-django/.devcontainer/Dockerfile index 2c9fe8959a..16c26c27c0 100644 --- a/containers/python-3-django/.devcontainer/Dockerfile +++ b/containers/python-3-django/.devcontainer/Dockerfile @@ -5,6 +5,9 @@ FROM python:3-slim +# Copy default endpoint specific user settings overrides into container to specify Python path +COPY .devcontainer/settings.vscode.json /root/.vscode-remote/data/User/settings.json + ENV PYTHONUNBUFFERED 1 RUN pip install pylint diff --git a/containers/python-3-django/.devcontainer/settings.vscode.json b/containers/python-3-django/.devcontainer/settings.vscode.json new file mode 100644 index 0000000000..80a4895ace --- /dev/null +++ b/containers/python-3-django/.devcontainer/settings.vscode.json @@ -0,0 +1,4 @@ +{ + "python.linting.pylintEnabled": true, + "python.pythonPath": "/usr/local/bin/python" +} \ No newline at end of file diff --git a/containers/python-3-flask-redis/.devcontainer/Dockerfile b/containers/python-3-flask-redis/.devcontainer/Dockerfile index 57eae7264a..4d891a2282 100644 --- a/containers/python-3-flask-redis/.devcontainer/Dockerfile +++ b/containers/python-3-flask-redis/.devcontainer/Dockerfile @@ -5,10 +5,13 @@ FROM python:3-slim +# Copy default endpoint specific user settings overrides into container to specify Python path +COPY settings.vscode.json /root/.vscode-remote/data/User/settings.json + RUN mkdir /app WORKDIR /app -COPY .devcontainer/requirements.txt /app/ +COPY requirements.txt /app/ RUN pip install -r requirements.txt RUN pip install pylint diff --git a/containers/python-3-flask-redis/.devcontainer/docker-compose.yml b/containers/python-3-flask-redis/.devcontainer/docker-compose.yml index b186dadafc..a40ed589ef 100644 --- a/containers/python-3-flask-redis/.devcontainer/docker-compose.yml +++ b/containers/python-3-flask-redis/.devcontainer/docker-compose.yml @@ -12,7 +12,7 @@ services: ports: - "5000:5000" volumes: - - .:/app + - ..:/app command: sleep infinity redis: image: "redis:alpine" diff --git a/containers/python-3-flask-redis/.devcontainer/settings.vscode.json b/containers/python-3-flask-redis/.devcontainer/settings.vscode.json new file mode 100644 index 0000000000..8ad19d5bb5 --- /dev/null +++ b/containers/python-3-flask-redis/.devcontainer/settings.vscode.json @@ -0,0 +1,3 @@ +{ + "python.pythonPath": "/usr/local/bin/python" +} \ No newline at end of file diff --git a/containers/python-3-flask-redis/.vscode/settings.json b/containers/python-3-flask-redis/.vscode/settings.json index 500bc70073..8ad19d5bb5 100644 --- a/containers/python-3-flask-redis/.vscode/settings.json +++ b/containers/python-3-flask-redis/.vscode/settings.json @@ -1,3 +1,3 @@ { - "python.linting.pylintEnabled": true + "python.pythonPath": "/usr/local/bin/python" } \ No newline at end of file diff --git a/containers/python-3-jupyter-pyspark/.devcontainer/Dockerfile b/containers/python-3-jupyter-pyspark/.devcontainer/Dockerfile index e21a03f5d9..7b81ba9f78 100644 --- a/containers/python-3-jupyter-pyspark/.devcontainer/Dockerfile +++ b/containers/python-3-jupyter-pyspark/.devcontainer/Dockerfile @@ -10,10 +10,10 @@ USER root RUN pip install pylint # Copy jupyter_notebook_config.py with token that matches settings -COPY .devcontainer/jupyter_notebook_config.py /home/jovyan/.jupyter/jupyter_notebook_config.py +COPY jupyter_notebook_config.py /home/jovyan/.jupyter/jupyter_notebook_config.py # Copy default endpoint specific user settings overrides into container to specify Python path, token -COPY .devcontainer/settings.vscode.json /home/jovyan/.vscode-remote/data/User/settings.json +COPY settings.vscode.json /home/jovyan/.vscode-remote/data/User/settings.json # Install git RUN apt-get update && apt-get -y install git diff --git a/containers/python-3-jupyter-pyspark/.devcontainer/docker-compose.yml b/containers/python-3-jupyter-pyspark/.devcontainer/docker-compose.yml index f3da5ad23b..d14c0047a5 100644 --- a/containers/python-3-jupyter-pyspark/.devcontainer/docker-compose.yml +++ b/containers/python-3-jupyter-pyspark/.devcontainer/docker-compose.yml @@ -11,9 +11,9 @@ services: jupyter: build: context: . - dockerfile: .devcontainer/Dockerfile + dockerfile: Dockerfile ports: - "8888:8888" volumes: - - .:/notebook + - ..:/notebook diff --git a/containers/python-3/.devcontainer/Dockerfile b/containers/python-3/.devcontainer/Dockerfile index df9cd48b34..5afc945c44 100644 --- a/containers/python-3/.devcontainer/Dockerfile +++ b/containers/python-3/.devcontainer/Dockerfile @@ -5,6 +5,9 @@ FROM python:3-slim +# Copy default endpoint specific user settings overrides into container to specify Python path +COPY .devcontainer/settings.vscode.json /root/.vscode-remote/data/User/settings.json + RUN pip install pylint # Install git diff --git a/containers/python-3/.devcontainer/settings.vscode.json b/containers/python-3/.devcontainer/settings.vscode.json new file mode 100644 index 0000000000..8ad19d5bb5 --- /dev/null +++ b/containers/python-3/.devcontainer/settings.vscode.json @@ -0,0 +1,3 @@ +{ + "python.pythonPath": "/usr/local/bin/python" +} \ No newline at end of file