Merge pull request #84 from matthew-t-smith/dev/msmith/docker-again

Clean PR of Docker Logic
PyWorkflowApp · May 6, 2020 · 8a7746f · 8a7746f
2 parents d35ce87 + 8e43a6d
commit 8a7746f
Show file tree

Hide file tree

Showing 63 changed files with 87 additions and 4 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,24 @@
+.git
+.vscode
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -31,6 +31,7 @@ jobs:
       run: |
         python3 -m pip install --upgrade pip
         pip3 install pipenv
+        cd back-end
         pipenv install
         pipenv run echo "SECRET_KEY='TEMPORARY SECRET KEY'" > vp/.environment
 
@@ -61,4 +62,3 @@ jobs:
       with:
         collection: Postman/Visual\ Programming-Tests.postman_collection.json
         environment: Postman/Local\ Testing.postman_environment.json
-
diff --git a/CLI/__init__.py → back-end/CLI/__init__.py b/CLI/__init__.py → back-end/CLI/__init__.py
diff --git a/CLI/cli.py → back-end/CLI/cli.py b/CLI/cli.py → back-end/CLI/cli.py
diff --git a/CLI/setup.py → back-end/CLI/setup.py b/CLI/setup.py → back-end/CLI/setup.py
diff --git a/CLI/test.py → back-end/CLI/test.py b/CLI/test.py → back-end/CLI/test.py
diff --git a/back-end/Dockerfile b/back-end/Dockerfile
@@ -0,0 +1,19 @@
+FROM python:3.8
+
+WORKDIR /visual-programming/back-end
+
+COPY Pipfile Pipfile.lock ./
+COPY CLI/ ./CLI/
+COPY pyworkflow/ ./pyworkflow/
+
+RUN pip install pipenv
+RUN pipenv install --dev --ignore-pipfile
+
+COPY vp/ ./vp
+RUN echo "SECRET_KEY=tmp" > vp/.environment
+
+EXPOSE 8000
+
+WORKDIR /visual-programming/back-end/vp
+
+CMD pipenv run python manage.py runserver 0.0.0.0:8000
diff --git a/Pipfile → back-end/Pipfile b/Pipfile → back-end/Pipfile
diff --git a/Pipfile.lock → back-end/Pipfile.lock b/Pipfile.lock → back-end/Pipfile.lock
diff --git a/pyworkflow/pyworkflow/.coveragerc → back-end/pyworkflow/pyworkflow/.coveragerc b/pyworkflow/pyworkflow/.coveragerc → back-end/pyworkflow/pyworkflow/.coveragerc
diff --git a/pyworkflow/pyworkflow/__init__.py → back-end/pyworkflow/pyworkflow/__init__.py b/pyworkflow/pyworkflow/__init__.py → back-end/pyworkflow/pyworkflow/__init__.py
diff --git a/pyworkflow/pyworkflow/node.py → back-end/pyworkflow/pyworkflow/node.py b/pyworkflow/pyworkflow/node.py → back-end/pyworkflow/pyworkflow/node.py
diff --git a/pyworkflow/pyworkflow/node_factory.py → ...end/pyworkflow/pyworkflow/node_factory.py b/pyworkflow/pyworkflow/node_factory.py → ...end/pyworkflow/pyworkflow/node_factory.py
diff --git a/pyworkflow/pyworkflow/nodes/__init__.py → ...d/pyworkflow/pyworkflow/nodes/__init__.py b/pyworkflow/pyworkflow/nodes/__init__.py → ...d/pyworkflow/pyworkflow/nodes/__init__.py
diff --git a/...kflow/nodes/custom_nodes/table_creator.py → ...kflow/nodes/custom_nodes/table_creator.py b/...kflow/nodes/custom_nodes/table_creator.py → ...kflow/nodes/custom_nodes/table_creator.py
diff --git a/...pyworkflow/nodes/flow_control/__init__.py → ...pyworkflow/nodes/flow_control/__init__.py b/...pyworkflow/nodes/flow_control/__init__.py → ...pyworkflow/nodes/flow_control/__init__.py
diff --git a/...kflow/nodes/flow_control/integer_input.py → ...kflow/nodes/flow_control/integer_input.py b/...kflow/nodes/flow_control/integer_input.py → ...kflow/nodes/flow_control/integer_input.py
diff --git a/...rkflow/nodes/flow_control/string_input.py → ...rkflow/nodes/flow_control/string_input.py b/...rkflow/nodes/flow_control/string_input.py → ...rkflow/nodes/flow_control/string_input.py
diff --git a/pyworkflow/pyworkflow/nodes/io/__init__.py → ...yworkflow/pyworkflow/nodes/io/__init__.py b/pyworkflow/pyworkflow/nodes/io/__init__.py → ...yworkflow/pyworkflow/nodes/io/__init__.py
diff --git a/pyworkflow/pyworkflow/nodes/io/read_csv.py → ...yworkflow/pyworkflow/nodes/io/read_csv.py b/pyworkflow/pyworkflow/nodes/io/read_csv.py → ...yworkflow/pyworkflow/nodes/io/read_csv.py
diff --git a/pyworkflow/pyworkflow/nodes/io/write_csv.py → ...workflow/pyworkflow/nodes/io/write_csv.py b/pyworkflow/pyworkflow/nodes/io/write_csv.py → ...workflow/pyworkflow/nodes/io/write_csv.py
diff --git a/...pyworkflow/nodes/manipulation/__init__.py → ...pyworkflow/nodes/manipulation/__init__.py b/...pyworkflow/nodes/manipulation/__init__.py → ...pyworkflow/nodes/manipulation/__init__.py
diff --git a/...w/pyworkflow/nodes/manipulation/filter.py → ...w/pyworkflow/nodes/manipulation/filter.py b/...w/pyworkflow/nodes/manipulation/filter.py → ...w/pyworkflow/nodes/manipulation/filter.py
diff --git a/...low/pyworkflow/nodes/manipulation/join.py → ...low/pyworkflow/nodes/manipulation/join.py b/...low/pyworkflow/nodes/manipulation/join.py → ...low/pyworkflow/nodes/manipulation/join.py
diff --git a/...ow/pyworkflow/nodes/manipulation/pivot.py → ...ow/pyworkflow/nodes/manipulation/pivot.py b/...ow/pyworkflow/nodes/manipulation/pivot.py → ...ow/pyworkflow/nodes/manipulation/pivot.py
diff --git a/...yworkflow/nodes/visualization/__init__.py → ...yworkflow/nodes/visualization/__init__.py b/...yworkflow/nodes/visualization/__init__.py → ...yworkflow/nodes/visualization/__init__.py
diff --git a/...w/pyworkflow/nodes/visualization/graph.py → ...w/pyworkflow/nodes/visualization/graph.py b/...w/pyworkflow/nodes/visualization/graph.py → ...w/pyworkflow/nodes/visualization/graph.py
diff --git a/pyworkflow/pyworkflow/parameters.py → back-end/pyworkflow/pyworkflow/parameters.py b/pyworkflow/pyworkflow/parameters.py → back-end/pyworkflow/pyworkflow/parameters.py
diff --git a/...flow/pyworkflow/tests/sample_test_data.py → ...flow/pyworkflow/tests/sample_test_data.py b/...flow/pyworkflow/tests/sample_test_data.py → ...flow/pyworkflow/tests/sample_test_data.py
diff --git a/pyworkflow/pyworkflow/tests/test_node.py → .../pyworkflow/pyworkflow/tests/test_node.py b/pyworkflow/pyworkflow/tests/test_node.py → .../pyworkflow/pyworkflow/tests/test_node.py
diff --git a/...kflow/pyworkflow/tests/test_parameters.py → ...kflow/pyworkflow/tests/test_parameters.py b/...kflow/pyworkflow/tests/test_parameters.py → ...kflow/pyworkflow/tests/test_parameters.py
diff --git a/...kflow/pyworkflow/tests/test_pyworkflow.py → ...kflow/pyworkflow/tests/test_pyworkflow.py b/...kflow/pyworkflow/tests/test_pyworkflow.py → ...kflow/pyworkflow/tests/test_pyworkflow.py
diff --git a/pyworkflow/pyworkflow/tests/test_workflow.py → ...orkflow/pyworkflow/tests/test_workflow.py b/pyworkflow/pyworkflow/tests/test_workflow.py → ...orkflow/pyworkflow/tests/test_workflow.py
diff --git a/pyworkflow/pyworkflow/workflow.py → back-end/pyworkflow/pyworkflow/workflow.py b/pyworkflow/pyworkflow/workflow.py → back-end/pyworkflow/pyworkflow/workflow.py
diff --git a/pyworkflow/setup.py → back-end/pyworkflow/setup.py b/pyworkflow/setup.py → back-end/pyworkflow/setup.py
diff --git a/vp/manage.py → back-end/vp/manage.py b/vp/manage.py → back-end/vp/manage.py
diff --git a/vp/node/__init__.py → back-end/vp/node/__init__.py b/vp/node/__init__.py → back-end/vp/node/__init__.py
diff --git a/vp/node/admin.py → back-end/vp/node/admin.py b/vp/node/admin.py → back-end/vp/node/admin.py
diff --git a/vp/node/apps.py → back-end/vp/node/apps.py b/vp/node/apps.py → back-end/vp/node/apps.py
diff --git a/vp/node/migrations/__init__.py → back-end/vp/node/migrations/__init__.py b/vp/node/migrations/__init__.py → back-end/vp/node/migrations/__init__.py
diff --git a/vp/node/models.py → back-end/vp/node/models.py b/vp/node/models.py → back-end/vp/node/models.py
diff --git a/vp/node/tests.py → back-end/vp/node/tests.py b/vp/node/tests.py → back-end/vp/node/tests.py
diff --git a/vp/node/urls.py → back-end/vp/node/urls.py b/vp/node/urls.py → back-end/vp/node/urls.py
diff --git a/vp/node/views.py → back-end/vp/node/views.py b/vp/node/views.py → back-end/vp/node/views.py
diff --git a/vp/vp/__init__.py → back-end/vp/vp/__init__.py b/vp/vp/__init__.py → back-end/vp/vp/__init__.py
diff --git a/vp/vp/asgi.py → back-end/vp/vp/asgi.py b/vp/vp/asgi.py → back-end/vp/vp/asgi.py
diff --git a/vp/vp/settings.py → back-end/vp/vp/settings.py b/vp/vp/settings.py → back-end/vp/vp/settings.py
@@ -25,7 +25,12 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['back-end:8000',
+                 'back-end',
+                 'localhost',
+                 '127.0.0.1',
+                 '0.0.0.0',
+                 '[::1]']
 
 
 # Application definition
@@ -81,7 +86,7 @@
 
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
-### Not yet setup
+# Not yet setup
 DATABASES = {}
 
 MEDIA_ROOT = '/tmp'

diff --git a/vp/vp/urls.py → back-end/vp/vp/urls.py b/vp/vp/urls.py → back-end/vp/vp/urls.py
diff --git a/vp/vp/views.py → back-end/vp/vp/views.py b/vp/vp/views.py → back-end/vp/vp/views.py
diff --git a/vp/vp/wsgi.py → back-end/vp/vp/wsgi.py b/vp/vp/wsgi.py → back-end/vp/vp/wsgi.py
diff --git a/vp/workflow/__init__.py → back-end/vp/workflow/__init__.py b/vp/workflow/__init__.py → back-end/vp/workflow/__init__.py
diff --git a/vp/workflow/admin.py → back-end/vp/workflow/admin.py b/vp/workflow/admin.py → back-end/vp/workflow/admin.py
diff --git a/vp/workflow/apps.py → back-end/vp/workflow/apps.py b/vp/workflow/apps.py → back-end/vp/workflow/apps.py
diff --git a/vp/workflow/middleware.py → back-end/vp/workflow/middleware.py b/vp/workflow/middleware.py → back-end/vp/workflow/middleware.py
diff --git a/vp/workflow/migrations/__init__.py → back-end/vp/workflow/migrations/__init__.py b/vp/workflow/migrations/__init__.py → back-end/vp/workflow/migrations/__init__.py
diff --git a/vp/workflow/models.py → back-end/vp/workflow/models.py b/vp/workflow/models.py → back-end/vp/workflow/models.py
diff --git a/vp/workflow/tests.py → back-end/vp/workflow/tests.py b/vp/workflow/tests.py → back-end/vp/workflow/tests.py
diff --git a/vp/workflow/urls.py → back-end/vp/workflow/urls.py b/vp/workflow/urls.py → back-end/vp/workflow/urls.py
diff --git a/vp/workflow/views.py → back-end/vp/workflow/views.py b/vp/workflow/views.py → back-end/vp/workflow/views.py
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,21 @@
+version: "3.3"
+services:
+  back-end:
+    build: ./back-end
+    ports:
+      - "8000:8000"
+    command: bash -c "pipenv run python manage.py runserver 0.0.0.0:8000"
+    environment:
+      - DJANGO_ENV=development
+  front-end:
+    build: ./front-end
+    stdin_open: true
+    ports:
+      - "3000:3000"
+    environment:
+      - NODE_ENV=development
+    depends_on:
+      - back-end
+    links:
+      - back-end
+    command: npm start
diff --git a/front-end/Dockerfile b/front-end/Dockerfile
@@ -0,0 +1,14 @@
+FROM node:14-alpine
+
+WORKDIR /visual-programming/front-end
+
+COPY package.json .
+
+RUN npm install
+
+COPY src/ ./src/
+COPY public/ ./public/
+
+EXPOSE 3000
+
+CMD npm start
diff --git a/front-end/package.json b/front-end/package.json
@@ -67,7 +67,7 @@
       "last 1 safari version"
     ]
   },
-  "proxy": "http://localhost:8000",
+  "proxy": "http://back-end:8000",
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
     "@babel/preset-react": "^7.9.4",

diff --git a/vp/db.sqlite3 b/vp/db.sqlite3