removed unused env vars, removed watch scripts for celery, added watchdog to dev deps, improved docker-compose context issues, improved quasar start script

Author: briancaffey

.env.template

@@ -1,13 +1,6 @@
 SECRET_KEY=secret
 DEBUG=True
 
-POSTGRES_NAME=postgres
-POSTGRES_USERNAME=postgres
-POSTGRES_PASSWORD=postgres
-POSTGRES_SERVICE_HOST=postgres
-POSTGRES_SERVICE_PORT=5432
-
-
 # social auth
 GITHUB_KEY=yourkey
 GITHUB_SECRET=yoursecret
@@ -18,9 +11,6 @@ GOOGLE_OAUTH2_SECRET=abcde-fghij
 SOCIAL_AUTH_FACEBOOK_KEY = ''
 SOCIAL_AUTH_FACEBOOK_SECRET = ''
 
-CELERY_BROKER_URL=redis://redis:6379/0
-CELERY_RESULT_BACKEND=redis://redis:6379/1
-
 DJANGO_EMAIL_HOST=mailhog
 DJANGO_EMAIL_PORT=1025
 

.python-version

@@ -0,0 +1,2 @@
+media
+static

backend/.dockerignore

@@ -15,11 +15,8 @@
 from kombu import Queue
 import redis
 
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(
-    os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-)
-
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve(strict=True).parent.parent.parent
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/
@@ -269,7 +266,7 @@
 # Assets
 
 STATIC_URL = "/static/"
-STATIC_ROOT = "/static/"
+STATIC_ROOT = os.path.join(BASE_DIR, "media")
 
 MEDIA_URL = "/media/"
 MEDIA_ROOT = os.path.join(BASE_DIR, "media")

backend/apps/core/management/commands/watch_celery.py

@@ -3,4 +3,8 @@ django-extensions==2.2.9  # NOTE: in installed_apps
 Werkzeug==1.0.1 # used for runserver_plus exception console
 ipython==7.14.0
 jupyter==1.0.0
-gql==2.0.0
+gql==2.0.0
+
+watchdog==0.10.3
+pyyaml==5.3.1
+argh==0.26.2

backend/apps/core/management/commands/watch_celery_beat.py

@@ -40,8 +40,8 @@ services:
   nginx:
     container_name: nginx
     build:
-      context: .
-      dockerfile: nginx/dev/Dockerfile
+      context: ./nginx
+      dockerfile: dev/Dockerfile
     ports:
       - "80:80"
     depends_on:
@@ -129,18 +129,42 @@ services:
   celery:
     <<: *backend
     container_name: celery
-    command: bash -c 'python3 manage.py watch_celery --queue default --concurrency=2'
-    volumes:
-      - ./backend:/code
+    command:
+      - "watchmedo"
+      - "auto-restart"
+      - "--directory=./"
+      - "--pattern=*.py"
+      - "--recursive"
+      - "--"
+      - "celery"
+      - "worker"
+      - "--app=backend.celery_app:app"
+      - "-Q"
+      - "default"
+      - "--concurrency=1"
+      - "--loglevel=INFO"
     ports: []
 
   beat:
     <<: *backend
-    build:
-      context: ./backend
-      dockerfile: scripts/dev/Dockerfile
     container_name: beat
-    command: /start_beat.sh
+    command:
+      - "sh"
+      - "-c"
+      - |
+        # remove celerybeat.pid and celerybeat-schedule if they exist
+        rm -f /code/celerybeat*;
+        watchmedo \
+          auto-restart \
+          --directory=./ \
+          --pattern=*.py \
+          --recursive \
+          -- \
+          celery \
+          beat \
+          --app=backend.celery_app:app \
+          --loglevel=INFO \
+          --pidfile=/code/celerybeat.pid
     volumes:
       - ./backend:/code
     ports: []
@@ -150,7 +174,7 @@ services:
     container_name: flower
     command: --url_prefix=flower --inspect_timeout=20000
     environment:
-      - CELERY_BROKER_URL=${CELERY_BROKER_URL}
+      - CELERY_BROKER_URL=redis://redis:6379/0
       - FLOWER_PORT=5555
     ports:
       - 5555:5555

backend/backend/settings/base.py

@@ -1,5 +1,4 @@
 FROM nginx:1.18.0-alpine
-COPY nginx/dev/dev.conf /etc/nginx/nginx.conf
-COPY backend/static /usr/src/app/static/
+COPY dev/dev.conf /etc/nginx/nginx.conf
 EXPOSE 80
 CMD ["nginx", "-g", "daemon off;"]

backend/requirements/dev.txt

@@ -0,0 +1 @@
+node_modules

docker-compose.yml

@@ -1,13 +1,7 @@
-FROM node:12.16.3
+FROM node:10-alpine
 
 WORKDIR /app/
 
 COPY . .
 
-RUN npm install -g @quasar/cli && \
-    npm install -g @vue/cli && \
-    npm install -g @vue/cli-init
-
-COPY start_dev.sh .
-
 CMD ["/app/start_dev.sh"]

nginx/dev/Dockerfile

@@ -1,4 +1,6 @@
-#!/bin/bash
+#!/bin/sh
+
+npm install -g @quasar/cli
 
 npm install