Refactor docker-compose and run scripts

- switch to using app object from autoapp.py
- update docker-compose files
  - split configuration into 3 separate files
    - docker-compose.yaml as base file
      - add postgres data as volume
    - docker-compose.override.yaml as "production" compose
      - included automatically by docker-compose when not using "--file"
      - doesn't publish ports for any service other than frontend
    - docker-compose.dev.yaml for development compose
      - best used from dev-composition.sh
      - publishes ports for each service
- update dev-composition.sh
  - uses docker-compose.yaml and docker-compose.dev.yaml
  - remove using "up" docker-compose command by default
- add dev.env used by dev-composition.sh

Author: Yamsha75

.gitignore

@@ -1,2 +1,3 @@
 # .env files with settings and secrets
 *.env
+!dev.env

api/main.bat

@@ -1,3 +1,3 @@
 @echo off
 
-waitress-serve %* --call "everycache_api.app:create_app"
+waitress-serve %* "autoapp:app"

api/main.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-waitress-serve $@ --call "everycache_api.app:create_app"
+waitress-serve $@ "autoapp:app"

dev-composition.sh

@@ -1,2 +1,3 @@
 #!/bin/bash
-docker-compose -f docker-compose.dev.yaml up $@
+
+docker-compose --env-file dev.env --file docker-compose.yaml --file docker-compose.dev.yaml $@

dev.env

@@ -0,0 +1,6 @@
+# development environment variables for docker-compose
+
+HASHIDS_SALT=dev-hashids-salt
+SECRET_KEY=dev-secret-key
+POSTGRES_USER=admin
+POSTGRES_PASSWORD=root

docker-compose.dev.yaml

@@ -1,42 +1,39 @@
+# development docker-compose; extends and overrides base docker-compose.yaml file;
+# for usage example, please see dev-composition.sh
+
 version: "3.9"
 
 services:
-  db:
-    image: postgres:latest
-    environment:
-      - POSTGRES_PASSWORD=password
   frontend:
-    build: frontend
     ports:
-      - 80:3000
-    depends_on:
-      - api
+      - 3000:3000
+
   api:
-    build: api
-    ports:
-      - 5000:8080
+    environment:
+      FLASK_ENV: development
+      FRONTEND_APP_URL: frontend:3000
+      HASHIDS_SALT: dev-hashids-salt
+      SECRET_KEY: dev-secret-key
+    command: flask run --host 0.0.0.0
     volumes:
       - ./api:/code
-    command: ["waitress-serve", "autoapp:app"]
-    environment:
-      - DATABASE_URI=${DATABASE_URI}
-      - FLASK_APP=${FLASK_APP}
-      - FLASK_ENV=${FLASK_ENV}
-      - SECRET_KEY=${SECRET_KEY}
-      - HASHIDS_SALT=${HASHIDS_SALT}
-      - FRONTEND_APP_URL=${FRONTEND_APP_URL}
-      - REDIS_URL=${REDIS_URL}
-    depends_on:
-      - redis
-      - db
+    ports:
+      - 5000:5000
+
+  database:
+    ports:
+      - 5432:5432
+
   redis:
-    image: redis:alpine
     ports:
       - 6379:6379
+
   redis-commander:
     image: rediscommander/redis-commander:latest
+    depends_on:
+      - redis
     environment:
-      - REDIS_HOST=redis
-      - REDIS_PORT=6379
+      REDIS_HOST: redis
+      REDIS_PORT: 6379
     ports:
       - 8081:8081

docker-compose.override.yaml

@@ -0,0 +1,14 @@
+# "production" docker-compose; this file is added by default by docker-compose,
+# unless --file is specified and is skipped in dev-composition.sh
+
+version: "3.9"
+
+services:
+  frontend:
+    ports:
+      - 80:3000
+
+  api:
+    environment:
+      FLASK_ENV: production
+      FRONTEND_APP_URL: frontend:8080

docker-compose.yaml

@@ -1,17 +1,42 @@
+# base docker-compose; docker-compose.override.yaml is added by default by docker-compose,
+# unless --file is specified and is manually added in dev-composition.sh
+
 version: "3.9"
 
 services:
   frontend:
     build: frontend
-    ports:
-      - 80:3000
     depends_on:
       - api
+
   api:
     build: api
-    ports:
-      - 5000:8080
     depends_on:
+      - database
       - redis
+    environment:
+      DATABASE_URI: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@database:5432/everycache
+      FLASK_APP: autoapp:app
+      FLASK_ENV:
+      FRONTEND_APP_URL:
+      HASHIDS_ALPHABET:
+      HASHIDS_SALT:
+      JWT_ACCESS_TOKEN_EXPIRY_MINUTES:
+      JWT_REFRESH_TOKEN_EXPIRY_MINUTES:
+      REDIS_URL: redis://redis:6379/0
+      SECRET_KEY:
+
+  database:
+    image: postgres:latest
+    environment:
+      POSTGRES_DB: everycache
+      POSTGRES_USER:
+      POSTGRES_PASSWORD:
+    volumes:
+      - database-data:/var/lib/postgresql/data
+
   redis:
     image: redis:alpine
+
+volumes:
+  database-data: