Merge remote-tracking branch 'origin/master'

2021-05-03 15:59:14 +02:00 · 2021-05-03 15:59:14 +02:00 · f5b8ef21a2
commit f5b8ef21a2
parent b48f11b6dd 8c34ece094
3 changed files with 34 additions and 18437 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,6 +6,7 @@ node_modules/
 venv/
 env/

+db/


 .DS_Store
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -11,6 +11,10 @@ services:
        context: ./backend
        dockerfile: ./Dockerfile
    command: python manage.py runserver 0.0.0.0:8000
+    env_file:
+      - .env
+    volumes:
+    - ./db:/code/app_be/db
    ports:
      - 8000:8000

--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json