WIP: Docker containers

.dockerignore

@@ -0,0 +1,148 @@
+.git
+.vscode
+.idea/
+.DS_Store
+*.md
+LICENSE
+*/node_modules/
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+session_tmp/
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.environment
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/

.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
 

back-end/Dockerfile

@@ -0,0 +1,19 @@
+FROM python:3.8.2
+
+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

Pipfile → back-end/Pipfile

@@ -14,12 +14,12 @@ django = "~=3.0.4"
 pandas = "~=1.0.1"
 python-dotenv = "~=0.12.0"
 networkx = "~=2.4"
-pyworkflow = {path = "./pyworkflow",editable = true}
+pyworkflow = {path = "./pyworkflow", editable = true}
 djangorestframework = "*"
 drf-yasg = "*"
 click = "*"
 altair = "~=4.1.0"
 cli = {path = "./CLI",editable = true}
 
 [requires]
-python_version = "3.8"
+python_version = "3.8.2"

vp/manage.py → back-end/vp/manage.py

@@ -2,13 +2,11 @@
 """Django's command-line utility for administrative tasks."""
 import os
 import sys
-
 import dotenv
 
 
 def main():
     dotenv.load_dotenv(".environment")
-
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'vp.settings')
     try:
         from django.core.management import execute_from_command_line

vp/vp/settings.py → back-end/vp/vp/settings.py

@@ -25,7 +25,11 @@
 # 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',
+                 '[::1]', ]
 
 
 # Application definition
@@ -76,12 +80,10 @@
 
 SESSION_ENGINE = 'django.contrib.sessions.backends.file'
 
-WSGI_APPLICATION = 'vp.wsgi.application'
-
 
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
-### Not yet setup
+# Not yet setup
 DATABASES = {}
 
 MEDIA_ROOT = '/tmp'

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

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

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",