From 9ecea00187eb1d7c9d666e0a0eb40cef972be2d5 Mon Sep 17 00:00:00 2001 From: Matthew Smith Date: Tue, 5 May 2020 02:01:16 -0500 Subject: [PATCH 1/7] Back-end file migration --- {CLI => back-end/CLI}/__init__.py | 0 {CLI => back-end/CLI}/cli.py | 0 {CLI => back-end/CLI}/setup.py | 0 {CLI => back-end/CLI}/test.py | 0 Pipfile => back-end/Pipfile | 0 Pipfile.lock => back-end/Pipfile.lock | 0 .../pyworkflow}/pyworkflow/.coveragerc | 0 .../pyworkflow}/pyworkflow/__init__.py | 0 {pyworkflow => back-end/pyworkflow}/pyworkflow/node.py | 0 .../pyworkflow}/pyworkflow/node_factory.py | 0 .../pyworkflow}/pyworkflow/nodes/__init__.py | 0 .../pyworkflow/nodes/custom_nodes/table_creator.py | 0 .../pyworkflow/nodes/flow_control/__init__.py | 0 .../pyworkflow/nodes/flow_control/integer_input.py | 0 .../pyworkflow/nodes/flow_control/string_input.py | 0 .../pyworkflow}/pyworkflow/nodes/io/__init__.py | 0 .../pyworkflow}/pyworkflow/nodes/io/read_csv.py | 0 .../pyworkflow}/pyworkflow/nodes/io/write_csv.py | 0 .../pyworkflow/nodes/manipulation/__init__.py | 0 .../pyworkflow}/pyworkflow/nodes/manipulation/filter.py | 0 .../pyworkflow}/pyworkflow/nodes/manipulation/join.py | 0 .../pyworkflow}/pyworkflow/nodes/manipulation/pivot.py | 0 .../pyworkflow/nodes/visualization/__init__.py | 0 .../pyworkflow}/pyworkflow/nodes/visualization/graph.py | 0 .../pyworkflow}/pyworkflow/parameters.py | 0 .../pyworkflow}/pyworkflow/tests/sample_test_data.py | 0 .../pyworkflow}/pyworkflow/tests/test_node.py | 0 .../pyworkflow}/pyworkflow/tests/test_parameters.py | 0 .../pyworkflow}/pyworkflow/tests/test_pyworkflow.py | 0 .../pyworkflow}/pyworkflow/tests/test_workflow.py | 0 .../pyworkflow}/pyworkflow/workflow.py | 0 {pyworkflow => back-end/pyworkflow}/setup.py | 0 {vp => back-end/vp}/manage.py | 0 {vp => back-end/vp}/node/__init__.py | 0 {vp => back-end/vp}/node/admin.py | 0 {vp => back-end/vp}/node/apps.py | 0 {vp => back-end/vp}/node/migrations/__init__.py | 0 {vp => back-end/vp}/node/models.py | 0 {vp => back-end/vp}/node/tests.py | 0 {vp => back-end/vp}/node/urls.py | 0 {vp => back-end/vp}/node/views.py | 0 {vp => back-end/vp}/vp/__init__.py | 0 {vp => back-end/vp}/vp/asgi.py | 0 {vp => back-end/vp}/vp/settings.py | 9 +++++++-- {vp => back-end/vp}/vp/urls.py | 0 {vp => back-end/vp}/vp/views.py | 0 {vp => back-end/vp}/vp/wsgi.py | 0 {vp => back-end/vp}/workflow/__init__.py | 0 {vp => back-end/vp}/workflow/admin.py | 0 {vp => back-end/vp}/workflow/apps.py | 0 {vp => back-end/vp}/workflow/middleware.py | 0 {vp => back-end/vp}/workflow/migrations/__init__.py | 0 {vp => back-end/vp}/workflow/models.py | 0 {vp => back-end/vp}/workflow/tests.py | 0 {vp => back-end/vp}/workflow/urls.py | 0 {vp => back-end/vp}/workflow/views.py | 0 vp/db.sqlite3 | 0 57 files changed, 7 insertions(+), 2 deletions(-) rename {CLI => back-end/CLI}/__init__.py (100%) rename {CLI => back-end/CLI}/cli.py (100%) rename {CLI => back-end/CLI}/setup.py (100%) rename {CLI => back-end/CLI}/test.py (100%) rename Pipfile => back-end/Pipfile (100%) rename Pipfile.lock => back-end/Pipfile.lock (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/.coveragerc (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/__init__.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/node.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/node_factory.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/nodes/__init__.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/nodes/custom_nodes/table_creator.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/nodes/flow_control/__init__.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/nodes/flow_control/integer_input.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/nodes/flow_control/string_input.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/nodes/io/__init__.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/nodes/io/read_csv.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/nodes/io/write_csv.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/nodes/manipulation/__init__.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/nodes/manipulation/filter.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/nodes/manipulation/join.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/nodes/manipulation/pivot.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/nodes/visualization/__init__.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/nodes/visualization/graph.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/parameters.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/tests/sample_test_data.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/tests/test_node.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/tests/test_parameters.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/tests/test_pyworkflow.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/tests/test_workflow.py (100%) rename {pyworkflow => back-end/pyworkflow}/pyworkflow/workflow.py (100%) rename {pyworkflow => back-end/pyworkflow}/setup.py (100%) rename {vp => back-end/vp}/manage.py (100%) rename {vp => back-end/vp}/node/__init__.py (100%) rename {vp => back-end/vp}/node/admin.py (100%) rename {vp => back-end/vp}/node/apps.py (100%) rename {vp => back-end/vp}/node/migrations/__init__.py (100%) rename {vp => back-end/vp}/node/models.py (100%) rename {vp => back-end/vp}/node/tests.py (100%) rename {vp => back-end/vp}/node/urls.py (100%) rename {vp => back-end/vp}/node/views.py (100%) rename {vp => back-end/vp}/vp/__init__.py (100%) rename {vp => back-end/vp}/vp/asgi.py (100%) rename {vp => back-end/vp}/vp/settings.py (94%) rename {vp => back-end/vp}/vp/urls.py (100%) rename {vp => back-end/vp}/vp/views.py (100%) rename {vp => back-end/vp}/vp/wsgi.py (100%) rename {vp => back-end/vp}/workflow/__init__.py (100%) rename {vp => back-end/vp}/workflow/admin.py (100%) rename {vp => back-end/vp}/workflow/apps.py (100%) rename {vp => back-end/vp}/workflow/middleware.py (100%) rename {vp => back-end/vp}/workflow/migrations/__init__.py (100%) rename {vp => back-end/vp}/workflow/models.py (100%) rename {vp => back-end/vp}/workflow/tests.py (100%) rename {vp => back-end/vp}/workflow/urls.py (100%) rename {vp => back-end/vp}/workflow/views.py (100%) delete mode 100644 vp/db.sqlite3 diff --git a/CLI/__init__.py b/back-end/CLI/__init__.py similarity index 100% rename from CLI/__init__.py rename to back-end/CLI/__init__.py diff --git a/CLI/cli.py b/back-end/CLI/cli.py similarity index 100% rename from CLI/cli.py rename to back-end/CLI/cli.py diff --git a/CLI/setup.py b/back-end/CLI/setup.py similarity index 100% rename from CLI/setup.py rename to back-end/CLI/setup.py diff --git a/CLI/test.py b/back-end/CLI/test.py similarity index 100% rename from CLI/test.py rename to back-end/CLI/test.py diff --git a/Pipfile b/back-end/Pipfile similarity index 100% rename from Pipfile rename to back-end/Pipfile diff --git a/Pipfile.lock b/back-end/Pipfile.lock similarity index 100% rename from Pipfile.lock rename to back-end/Pipfile.lock diff --git a/pyworkflow/pyworkflow/.coveragerc b/back-end/pyworkflow/pyworkflow/.coveragerc similarity index 100% rename from pyworkflow/pyworkflow/.coveragerc rename to back-end/pyworkflow/pyworkflow/.coveragerc diff --git a/pyworkflow/pyworkflow/__init__.py b/back-end/pyworkflow/pyworkflow/__init__.py similarity index 100% rename from pyworkflow/pyworkflow/__init__.py rename to back-end/pyworkflow/pyworkflow/__init__.py diff --git a/pyworkflow/pyworkflow/node.py b/back-end/pyworkflow/pyworkflow/node.py similarity index 100% rename from pyworkflow/pyworkflow/node.py rename to back-end/pyworkflow/pyworkflow/node.py diff --git a/pyworkflow/pyworkflow/node_factory.py b/back-end/pyworkflow/pyworkflow/node_factory.py similarity index 100% rename from pyworkflow/pyworkflow/node_factory.py rename to back-end/pyworkflow/pyworkflow/node_factory.py diff --git a/pyworkflow/pyworkflow/nodes/__init__.py b/back-end/pyworkflow/pyworkflow/nodes/__init__.py similarity index 100% rename from pyworkflow/pyworkflow/nodes/__init__.py rename to back-end/pyworkflow/pyworkflow/nodes/__init__.py diff --git a/pyworkflow/pyworkflow/nodes/custom_nodes/table_creator.py b/back-end/pyworkflow/pyworkflow/nodes/custom_nodes/table_creator.py similarity index 100% rename from pyworkflow/pyworkflow/nodes/custom_nodes/table_creator.py rename to back-end/pyworkflow/pyworkflow/nodes/custom_nodes/table_creator.py diff --git a/pyworkflow/pyworkflow/nodes/flow_control/__init__.py b/back-end/pyworkflow/pyworkflow/nodes/flow_control/__init__.py similarity index 100% rename from pyworkflow/pyworkflow/nodes/flow_control/__init__.py rename to back-end/pyworkflow/pyworkflow/nodes/flow_control/__init__.py diff --git a/pyworkflow/pyworkflow/nodes/flow_control/integer_input.py b/back-end/pyworkflow/pyworkflow/nodes/flow_control/integer_input.py similarity index 100% rename from pyworkflow/pyworkflow/nodes/flow_control/integer_input.py rename to back-end/pyworkflow/pyworkflow/nodes/flow_control/integer_input.py diff --git a/pyworkflow/pyworkflow/nodes/flow_control/string_input.py b/back-end/pyworkflow/pyworkflow/nodes/flow_control/string_input.py similarity index 100% rename from pyworkflow/pyworkflow/nodes/flow_control/string_input.py rename to back-end/pyworkflow/pyworkflow/nodes/flow_control/string_input.py diff --git a/pyworkflow/pyworkflow/nodes/io/__init__.py b/back-end/pyworkflow/pyworkflow/nodes/io/__init__.py similarity index 100% rename from pyworkflow/pyworkflow/nodes/io/__init__.py rename to back-end/pyworkflow/pyworkflow/nodes/io/__init__.py diff --git a/pyworkflow/pyworkflow/nodes/io/read_csv.py b/back-end/pyworkflow/pyworkflow/nodes/io/read_csv.py similarity index 100% rename from pyworkflow/pyworkflow/nodes/io/read_csv.py rename to back-end/pyworkflow/pyworkflow/nodes/io/read_csv.py diff --git a/pyworkflow/pyworkflow/nodes/io/write_csv.py b/back-end/pyworkflow/pyworkflow/nodes/io/write_csv.py similarity index 100% rename from pyworkflow/pyworkflow/nodes/io/write_csv.py rename to back-end/pyworkflow/pyworkflow/nodes/io/write_csv.py diff --git a/pyworkflow/pyworkflow/nodes/manipulation/__init__.py b/back-end/pyworkflow/pyworkflow/nodes/manipulation/__init__.py similarity index 100% rename from pyworkflow/pyworkflow/nodes/manipulation/__init__.py rename to back-end/pyworkflow/pyworkflow/nodes/manipulation/__init__.py diff --git a/pyworkflow/pyworkflow/nodes/manipulation/filter.py b/back-end/pyworkflow/pyworkflow/nodes/manipulation/filter.py similarity index 100% rename from pyworkflow/pyworkflow/nodes/manipulation/filter.py rename to back-end/pyworkflow/pyworkflow/nodes/manipulation/filter.py diff --git a/pyworkflow/pyworkflow/nodes/manipulation/join.py b/back-end/pyworkflow/pyworkflow/nodes/manipulation/join.py similarity index 100% rename from pyworkflow/pyworkflow/nodes/manipulation/join.py rename to back-end/pyworkflow/pyworkflow/nodes/manipulation/join.py diff --git a/pyworkflow/pyworkflow/nodes/manipulation/pivot.py b/back-end/pyworkflow/pyworkflow/nodes/manipulation/pivot.py similarity index 100% rename from pyworkflow/pyworkflow/nodes/manipulation/pivot.py rename to back-end/pyworkflow/pyworkflow/nodes/manipulation/pivot.py diff --git a/pyworkflow/pyworkflow/nodes/visualization/__init__.py b/back-end/pyworkflow/pyworkflow/nodes/visualization/__init__.py similarity index 100% rename from pyworkflow/pyworkflow/nodes/visualization/__init__.py rename to back-end/pyworkflow/pyworkflow/nodes/visualization/__init__.py diff --git a/pyworkflow/pyworkflow/nodes/visualization/graph.py b/back-end/pyworkflow/pyworkflow/nodes/visualization/graph.py similarity index 100% rename from pyworkflow/pyworkflow/nodes/visualization/graph.py rename to back-end/pyworkflow/pyworkflow/nodes/visualization/graph.py diff --git a/pyworkflow/pyworkflow/parameters.py b/back-end/pyworkflow/pyworkflow/parameters.py similarity index 100% rename from pyworkflow/pyworkflow/parameters.py rename to back-end/pyworkflow/pyworkflow/parameters.py diff --git a/pyworkflow/pyworkflow/tests/sample_test_data.py b/back-end/pyworkflow/pyworkflow/tests/sample_test_data.py similarity index 100% rename from pyworkflow/pyworkflow/tests/sample_test_data.py rename to back-end/pyworkflow/pyworkflow/tests/sample_test_data.py diff --git a/pyworkflow/pyworkflow/tests/test_node.py b/back-end/pyworkflow/pyworkflow/tests/test_node.py similarity index 100% rename from pyworkflow/pyworkflow/tests/test_node.py rename to back-end/pyworkflow/pyworkflow/tests/test_node.py diff --git a/pyworkflow/pyworkflow/tests/test_parameters.py b/back-end/pyworkflow/pyworkflow/tests/test_parameters.py similarity index 100% rename from pyworkflow/pyworkflow/tests/test_parameters.py rename to back-end/pyworkflow/pyworkflow/tests/test_parameters.py diff --git a/pyworkflow/pyworkflow/tests/test_pyworkflow.py b/back-end/pyworkflow/pyworkflow/tests/test_pyworkflow.py similarity index 100% rename from pyworkflow/pyworkflow/tests/test_pyworkflow.py rename to back-end/pyworkflow/pyworkflow/tests/test_pyworkflow.py diff --git a/pyworkflow/pyworkflow/tests/test_workflow.py b/back-end/pyworkflow/pyworkflow/tests/test_workflow.py similarity index 100% rename from pyworkflow/pyworkflow/tests/test_workflow.py rename to back-end/pyworkflow/pyworkflow/tests/test_workflow.py diff --git a/pyworkflow/pyworkflow/workflow.py b/back-end/pyworkflow/pyworkflow/workflow.py similarity index 100% rename from pyworkflow/pyworkflow/workflow.py rename to back-end/pyworkflow/pyworkflow/workflow.py diff --git a/pyworkflow/setup.py b/back-end/pyworkflow/setup.py similarity index 100% rename from pyworkflow/setup.py rename to back-end/pyworkflow/setup.py diff --git a/vp/manage.py b/back-end/vp/manage.py similarity index 100% rename from vp/manage.py rename to back-end/vp/manage.py diff --git a/vp/node/__init__.py b/back-end/vp/node/__init__.py similarity index 100% rename from vp/node/__init__.py rename to back-end/vp/node/__init__.py diff --git a/vp/node/admin.py b/back-end/vp/node/admin.py similarity index 100% rename from vp/node/admin.py rename to back-end/vp/node/admin.py diff --git a/vp/node/apps.py b/back-end/vp/node/apps.py similarity index 100% rename from vp/node/apps.py rename to back-end/vp/node/apps.py diff --git a/vp/node/migrations/__init__.py b/back-end/vp/node/migrations/__init__.py similarity index 100% rename from vp/node/migrations/__init__.py rename to back-end/vp/node/migrations/__init__.py diff --git a/vp/node/models.py b/back-end/vp/node/models.py similarity index 100% rename from vp/node/models.py rename to back-end/vp/node/models.py diff --git a/vp/node/tests.py b/back-end/vp/node/tests.py similarity index 100% rename from vp/node/tests.py rename to back-end/vp/node/tests.py diff --git a/vp/node/urls.py b/back-end/vp/node/urls.py similarity index 100% rename from vp/node/urls.py rename to back-end/vp/node/urls.py diff --git a/vp/node/views.py b/back-end/vp/node/views.py similarity index 100% rename from vp/node/views.py rename to back-end/vp/node/views.py diff --git a/vp/vp/__init__.py b/back-end/vp/vp/__init__.py similarity index 100% rename from vp/vp/__init__.py rename to back-end/vp/vp/__init__.py diff --git a/vp/vp/asgi.py b/back-end/vp/vp/asgi.py similarity index 100% rename from vp/vp/asgi.py rename to back-end/vp/vp/asgi.py diff --git a/vp/vp/settings.py b/back-end/vp/vp/settings.py similarity index 94% rename from vp/vp/settings.py rename to back-end/vp/vp/settings.py index 49453f9..79ff0ec 100644 --- a/vp/vp/settings.py +++ b/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 b/back-end/vp/vp/urls.py similarity index 100% rename from vp/vp/urls.py rename to back-end/vp/vp/urls.py diff --git a/vp/vp/views.py b/back-end/vp/vp/views.py similarity index 100% rename from vp/vp/views.py rename to back-end/vp/vp/views.py diff --git a/vp/vp/wsgi.py b/back-end/vp/vp/wsgi.py similarity index 100% rename from vp/vp/wsgi.py rename to back-end/vp/vp/wsgi.py diff --git a/vp/workflow/__init__.py b/back-end/vp/workflow/__init__.py similarity index 100% rename from vp/workflow/__init__.py rename to back-end/vp/workflow/__init__.py diff --git a/vp/workflow/admin.py b/back-end/vp/workflow/admin.py similarity index 100% rename from vp/workflow/admin.py rename to back-end/vp/workflow/admin.py diff --git a/vp/workflow/apps.py b/back-end/vp/workflow/apps.py similarity index 100% rename from vp/workflow/apps.py rename to back-end/vp/workflow/apps.py diff --git a/vp/workflow/middleware.py b/back-end/vp/workflow/middleware.py similarity index 100% rename from vp/workflow/middleware.py rename to back-end/vp/workflow/middleware.py diff --git a/vp/workflow/migrations/__init__.py b/back-end/vp/workflow/migrations/__init__.py similarity index 100% rename from vp/workflow/migrations/__init__.py rename to back-end/vp/workflow/migrations/__init__.py diff --git a/vp/workflow/models.py b/back-end/vp/workflow/models.py similarity index 100% rename from vp/workflow/models.py rename to back-end/vp/workflow/models.py diff --git a/vp/workflow/tests.py b/back-end/vp/workflow/tests.py similarity index 100% rename from vp/workflow/tests.py rename to back-end/vp/workflow/tests.py diff --git a/vp/workflow/urls.py b/back-end/vp/workflow/urls.py similarity index 100% rename from vp/workflow/urls.py rename to back-end/vp/workflow/urls.py diff --git a/vp/workflow/views.py b/back-end/vp/workflow/views.py similarity index 100% rename from vp/workflow/views.py rename to back-end/vp/workflow/views.py diff --git a/vp/db.sqlite3 b/vp/db.sqlite3 deleted file mode 100644 index e69de29..0000000 From c0d0c71abf2525a9a00879ec1401ff5eb7553d5c Mon Sep 17 00:00:00 2001 From: Matthew Smith Date: Tue, 5 May 2020 02:02:27 -0500 Subject: [PATCH 2/7] Adding docker files --- .dockerignore | 24 ++++++++++++++++++++++++ back-end/Dockerfile | 19 +++++++++++++++++++ docker-compose.yml | 26 ++++++++++++++++++++++++++ front-end/Dockerfile | 14 ++++++++++++++ 4 files changed, 83 insertions(+) create mode 100644 .dockerignore create mode 100644 back-end/Dockerfile create mode 100644 docker-compose.yml create mode 100644 front-end/Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..8604b6c --- /dev/null +++ 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/back-end/Dockerfile b/back-end/Dockerfile new file mode 100644 index 0000000..1fb0106 --- /dev/null +++ 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/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..2df6ef4 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,26 @@ +version: "3.3" +services: + back-end: + build: ./back-end + volumes: + - ./back-end:/visual-programming/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 + volumes: + - ./front-end:/visual-programming/front-end + # One-way volume to use node_modules from inside image + - /visual-programming/front-end/node_modules + 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 new file mode 100644 index 0000000..2e7842e --- /dev/null +++ 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 From a7d6772029f8fc0773b5e03bf7be51fc946280ef Mon Sep 17 00:00:00 2001 From: Matthew Smith Date: Tue, 5 May 2020 02:02:54 -0500 Subject: [PATCH 3/7] GitHub Actions fix & README updates --- .github/workflows/main.yml | 2 +- README.md | 28 ++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cba5dcb..7be4877 100644 --- 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 - \ No newline at end of file diff --git a/README.md b/README.md index 90d589e..fb50303 100644 --- a/README.md +++ b/README.md @@ -64,11 +64,11 @@ data from `localhost:8000` **where the Django app must be running**. --- ## CLI 1. Run pipenv shell. -2. Create a workflow using UI and save it. +2. Create a workflow using UI and save it. 3. Run it as: pyworkflow execute workflow-file Also accepts reading input from std (i.e < file.csv) and writing to sdt out (i.e > output.csv) - + --- @@ -94,3 +94,27 @@ directory, you can run - `coverage run -m unittest tests/*.py` - `coverage report` (to see a report via the CLI) - `coverage html && open /htmlcov/index.html` (to view interactive coverage) + + + +--- +## Docker +The Docker container for PyWorkflow is built from 2 images: the `front-end` and the `back-end`. The `docker-compose.yml` defines how to combine and run the two. + +In order to build each image individually, from the root of the application: +- `docker build front-end --tag FE_IMAGE[:TAG]` +- `docker build back-end --tag BE_IMAGE[:TAG]` + ex. - `docker build back-end --tag backendtest:2.0` + +Each individual image can be run by changing to the `front-end` or `back-end` directory and running: +- `docker run -p 3000:3000 --name FE_CONTAINER_NAME FE_IMAGE[:TAG]` +- `docker run -p 8000:8000 --name BE_CONTAINER_NAME BE_IMAGE[:TAG]` + ex. - `docker run -p 8000:8000 --name pyworkflow-be backendtest:2.0` + +To compose and run the entire application container, from the root of the application: +- `docker-compose up` + +You can then kill the container gracefully with: +- `docker-compose down` + +NOTE: For development, change ./front-end/package.json from "proxy": "http://back-end:8000" to "http://localhost:8000" to work. From d4ae51c734607a65d2aa8edb1dd86e64566ed1b8 Mon Sep 17 00:00:00 2001 From: Matt Thomas Date: Tue, 5 May 2020 07:44:28 -0400 Subject: [PATCH 4/7] fix: Add `stdin_open` to fix known `react-scripts` bug --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 2df6ef4..8bd1061 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,6 +15,7 @@ services: - ./front-end:/visual-programming/front-end # One-way volume to use node_modules from inside image - /visual-programming/front-end/node_modules + stdin_open: true ports: - "3000:3000" environment: From bf6d50c7178141bb1c15bc51b1b1dc08e67efeee Mon Sep 17 00:00:00 2001 From: Matt Thomas Date: Tue, 5 May 2020 07:45:01 -0400 Subject: [PATCH 5/7] fix: Default proxy to `back-end` for working with both containers --- front-end/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front-end/package.json b/front-end/package.json index 5cd81a3..64507d6 100644 --- 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", From 55c1352661d2ec20c79746227e52c2c427fbabce Mon Sep 17 00:00:00 2001 From: Matt Thomas Date: Tue, 5 May 2020 07:49:43 -0400 Subject: [PATCH 6/7] docs: Add note about running front-end solo in Docker --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index fb50303..5e258b5 100644 --- a/README.md +++ b/README.md @@ -111,6 +111,10 @@ Each individual image can be run by changing to the `front-end` or `back-end` di - `docker run -p 8000:8000 --name BE_CONTAINER_NAME BE_IMAGE[:TAG]` ex. - `docker run -p 8000:8000 --name pyworkflow-be backendtest:2.0` +Note: there [is a known issue with `react-scripts` v3.4.1](https://github.com/facebook/create-react-app/issues/8688) +that may cause the front-end container to exit with code 0. If this happens, +you can add `-e CI=true` to the `docker-run` command above for the front-end. + To compose and run the entire application container, from the root of the application: - `docker-compose up` From edfe3aff97221724d0e1c03e06a02a043939e254 Mon Sep 17 00:00:00 2001 From: Matthew Smith Date: Tue, 5 May 2020 22:07:36 -0500 Subject: [PATCH 7/7] Removing volume declarations in `docker-compose` --- docker-compose.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8bd1061..7b2a9a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,8 +2,6 @@ version: "3.3" services: back-end: build: ./back-end - volumes: - - ./back-end:/visual-programming/back-end ports: - "8000:8000" command: bash -c "pipenv run python manage.py runserver 0.0.0.0:8000" @@ -11,10 +9,6 @@ services: - DJANGO_ENV=development front-end: build: ./front-end - volumes: - - ./front-end:/visual-programming/front-end - # One-way volume to use node_modules from inside image - - /visual-programming/front-end/node_modules stdin_open: true ports: - "3000:3000"