Clean PR of Docker Logic

.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*

.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
-

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

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'

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

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