From 284c16dc547873d3c97e148fb438fae6b37974ef Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Wed, 3 Apr 2019 09:45:23 -0700
Subject: [PATCH] Moved pylint install into requirements.txt

---
 containers/python-3-django/.devcontainer/Dockerfile   | 11 +++++------
 .../python-3-django/.devcontainer/requirements.txt    |  1 +
 .../python-3-django/test-project/requirements.txt     |  1 +
 .../python-3-flask-redis/.devcontainer/Dockerfile     | 11 +++++------
 .../.devcontainer/docker-compose.yml                  |  2 +-
 .../.devcontainer/requirements.txt                    |  3 ++-
 .../python-3-flask-redis/.vscode/devContainer.json    |  2 +-
 .../test-project/requirements.txt                     |  2 ++
 8 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 containers/python-3-django/test-project/requirements.txt
 create mode 100644 containers/python-3-flask-redis/test-project/requirements.txt

diff --git a/containers/python-3-django/.devcontainer/Dockerfile b/containers/python-3-django/.devcontainer/Dockerfile
index 16c26c27c0..0da4976acf 100644
--- a/containers/python-3-django/.devcontainer/Dockerfile
+++ b/containers/python-3-django/.devcontainer/Dockerfile
@@ -10,13 +10,12 @@ COPY .devcontainer/settings.vscode.json /root/.vscode-remote/data/User/settings.
 
 ENV PYTHONUNBUFFERED 1
 
-RUN pip install pylint
+RUN mkdir /workspace
+WORKDIR /workspace
 
-RUN mkdir /app
-WORKDIR /app
-
-COPY .devcontainer/requirements.txt /app/
-RUN pip install -r requirements.txt
+# Install pylint and Django
+COPY .devcontainer/requirements.txt /workspace/
+RUN pip install -r requirements.txt && rm -f requirements.txt
 
 # Install git
 RUN apt-get update && apt-get -y install git
diff --git a/containers/python-3-django/.devcontainer/requirements.txt b/containers/python-3-django/.devcontainer/requirements.txt
index eec1cf15d5..2799568f85 100644
--- a/containers/python-3-django/.devcontainer/requirements.txt
+++ b/containers/python-3-django/.devcontainer/requirements.txt
@@ -1 +1,2 @@
+pylint
 Django
\ No newline at end of file
diff --git a/containers/python-3-django/test-project/requirements.txt b/containers/python-3-django/test-project/requirements.txt
new file mode 100644
index 0000000000..eec1cf15d5
--- /dev/null
+++ b/containers/python-3-django/test-project/requirements.txt
@@ -0,0 +1 @@
+Django
\ 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 4d891a2282..b55c0f12b0 100644
--- a/containers/python-3-flask-redis/.devcontainer/Dockerfile
+++ b/containers/python-3-flask-redis/.devcontainer/Dockerfile
@@ -8,13 +8,12 @@ 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
+RUN mkdir /workspace
+WORKDIR /workspace
 
-COPY requirements.txt /app/
-RUN pip install -r requirements.txt
-
-RUN pip install pylint
+# Install pylint, flask, redis
+COPY requirements.txt /workspace/
+RUN pip install -r requirements.txt && rm -f requirements.txt
 
 # Install git
 RUN apt-get update && apt-get -y install git
diff --git a/containers/python-3-flask-redis/.devcontainer/docker-compose.yml b/containers/python-3-flask-redis/.devcontainer/docker-compose.yml
index a40ed589ef..e6232b25c2 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
+      - ..:/workspace
     command: sleep infinity
   redis:
     image: "redis:alpine"
diff --git a/containers/python-3-flask-redis/.devcontainer/requirements.txt b/containers/python-3-flask-redis/.devcontainer/requirements.txt
index 1a5dc97b12..7ec70d54d7 100644
--- a/containers/python-3-flask-redis/.devcontainer/requirements.txt
+++ b/containers/python-3-flask-redis/.devcontainer/requirements.txt
@@ -1,2 +1,3 @@
+pylint
 flask
-redis
+redis
\ No newline at end of file
diff --git a/containers/python-3-flask-redis/.vscode/devContainer.json b/containers/python-3-flask-redis/.vscode/devContainer.json
index d19f2bc81e..0355ba00f3 100644
--- a/containers/python-3-flask-redis/.vscode/devContainer.json
+++ b/containers/python-3-flask-redis/.vscode/devContainer.json
@@ -2,7 +2,7 @@
     "name": "Python & Redis",
     "dockerComposeFile": ".devcontainer/docker-compose.yml",
     "service": "web",
-    "volume": "app",
+    "volume": "workspace",
     "extensions": [
         "ms-python.python",
 		"LittleFoxTeam.vscode-python-test-adapter"
diff --git a/containers/python-3-flask-redis/test-project/requirements.txt b/containers/python-3-flask-redis/test-project/requirements.txt
new file mode 100644
index 0000000000..1a5dc97b12
--- /dev/null
+++ b/containers/python-3-flask-redis/test-project/requirements.txt
@@ -0,0 +1,2 @@
+flask
+redis