Improved Docker configuration (#47)

* feat: moved advent folder -> puzzles, added some comments

* feat(docker): start separation of dev and prod builds, add pytest functionality to backend

* feat(docker): added dev/prod to frontend, transition frontend to yarn

* fix: remove .vscode folder

* fix(makefile): restructured makefile a bit

* feat: removed .vscode folder from git

* feat(auth): get rudimentary autotesting in place, created clear_database function

* feat(test): added all tests for auth/register

* fix(puzzle): changed blueprint in routes/puzzle.py

Author: hanyuone

.gitignore

@@ -1 +1,2 @@
-config/*.env
+config/*.env
+.vscode

Makefile

@@ -0,0 +1,42 @@
+## COMMON COMMANDS
+
+.PHONY: stop
+
+stop:
+	docker-compose down
+
+## DEVELOPMENT MODE
+
+.PHONY: build-dev dev destroy-dev restart-dev
+
+build-dev:
+	docker-compose -f docker-compose.yml -f docker-compose.dev.yml up --build
+
+dev:
+	docker-compose -f docker-compose.yml -f docker-compose.dev.yml up
+
+destroy-dev:
+	docker-compose -f docker-compose.yml -f docker-compose.dev.yml down -v
+
+restart-dev: destroy-dev build-dev
+
+## PRODUCTION MODE
+
+.PHONY: build run restart
+
+build:
+	docker-compose up --build -d
+
+run:
+	docker-compose up -d
+
+restart:
+	docker-compose down -v
+	docker-compose up --build -d
+
+## TESTS
+
+.PHONY: test-backend
+
+test-backend:
+	docker-compose exec backend pytest .

backend/Dockerfile

@@ -1,5 +1,7 @@
+## BASE BUILD THAT BOTH DEV AND PROD INHERIT FROM
+
 # pull official base image
-FROM python:3.8.10-slim-buster
+FROM python:3.8.10-slim-buster AS base
 
 # set work directory
 WORKDIR /backend
@@ -11,10 +13,27 @@ ENV PYTHONUNBUFFERED 1
 COPY Pipfile* /backend/
 
 RUN pip install pipenv
-RUN pipenv lock -r > requirements.txt
-RUN pip uninstall --yes pipenv
-RUN pip install -r requirements.txt
 
 EXPOSE 5001
 
+## DEV BUILD
+
+FROM base as dev
+
+RUN pipenv lock --dev --requirements > requirements.txt \
+    && pip uninstall --yes pipenv \
+    && pip install -r requirements.txt
+
+ENV FLASK_ENV development
+
 CMD [ "python", "app.py" ]
+
+## PROD BUILD
+
+FROM base as prod
+
+RUN pipenv lock --requirements > requirements.txt \
+    && pip uninstall --yes pipenv \
+    && pip install -r requirements.txt
+
+CMD [ "gunicorn", "--bind", "0.0.0.0:5001", "app:app" ]

backend/Pipfile

@@ -1,20 +1,24 @@
-[[source]]
-url = "https://pypi.python.org/simple"
-verify_ssl = true
-name = "pypi"
-
-[packages]
-Flask = "*"
-Flask-SQLAlchemy = "*"
-Flask-Login = "*"
-psycopg2-binary = "*"
-email-validator = "*"
-argon2-cffi = "*"
-flask-jwt-extended = "*"
-redis = "*"
-flask-cors = "*"
-
-[dev-packages]
-
-[requires]
-python_version = "3.8"
+[[source]]
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+Flask = "*"
+Flask-SQLAlchemy = "*"
+Flask-Login = "*"
+psycopg2-binary = "*"
+email-validator = "*"
+argon2-cffi = "*"
+flask-jwt-extended = "*"
+redis = "*"
+flask-cors = "*"
+flask-mail = "*"
+gunicorn = "*"
+
+[dev-packages]
+pytest = "*"
+requests = "*"
+
+[requires]
+python_version = "3.8"