Add database schema initialization

.devcontainer/devcontainer.json

@@ -45,7 +45,9 @@
           "editor.defaultFormatter": "charliermarsh.ruff"
         },
         "python.analysis.typeCheckingMode": "strict",
-        "markiscodecoverage.searchCriteria": "coverage.lcov"
+        "markiscodecoverage.searchCriteria": "coverage.lcov",
+        "remote.autoForwardPorts": false,
+        "remote.restoreForwardedPorts": false
       }
     }
   }

.gitignore

@@ -35,3 +35,4 @@ __pypackages__/
 # tad tool
 tad.log*
 database.sqlite3
+output/

.pre-commit-config.yaml

@@ -5,10 +5,11 @@ repos:
     rev: v4.6.0
     hooks:
       - id: end-of-file-fixer
-        exclude: ^tad/static/vendor/*
+        exclude: ^tad/static/vendor/.*
       - id: trailing-whitespace
       - id: check-yaml
       - id: check-json
+
       - id: check-added-large-files
       - id: check-merge-conflict
       - id: check-toml

.vscode/launch.json

@@ -7,20 +7,27 @@
       "request": "launch",
       "module": "uvicorn",
       "justMyCode": false,
-      "args": [ "--log-level", "warning" ,"tad.main:app"],
+      "args": [
+        "--log-level",
+        "warning",
+        "tad.main:app"
+      ],
       "cwd": "${workspaceFolder}/",
       "env": {
-        "PYTHONPATH": "${workspaceFolder}"
-      },
-      "envFile": "${workspaceFolder}/.env.test"
+        "PYTHONPATH": "${workspaceFolder}",
+        "DEBUG": "True",
+        "AUTO_CREATE_SCHEMA": "True",
+        "ENVIRONMENT": "demo",
+        "LOGGING_LEVEL": "DEBUG"
+      }
     },
     {
       "name": "Project: tests",
       "type": "debugpy",
       "request": "launch",
       "module": "pytest",
       "cwd": "${workspaceFolder}",
-      "justMyCode": true,
+      "justMyCode": false,
       "args": []
     }
   ]

Dockerfile

@@ -61,10 +61,13 @@ USER tad
 
 COPY --chown=root:root --chmod=755 ./tad /app/tad
 COPY --chown=root:root --chmod=755 alembic.ini /app/alembic.ini
-COPY --chown=root:root --chmod=755 .env /app/.env
+COPY --chown=root:root --chmod=755 prod.env /app/.env
 COPY --chown=root:root --chmod=755 LICENSE /app/LICENSE
+COPY --chown=tad:tad --chmod=755 docker-entrypoint.sh /app/docker-entrypoint.sh
 
 ENV PYTHONPATH=/app/
 WORKDIR /app/
 
-CMD ["python", "-m", "uvicorn", "--host", "0.0.0.0", "tad.main:app", "--log-level", "warning" ]
+ENV PATH="/app/:$PATH"
+
+CMD [ "docker-entrypoint.sh" ]

compose.yml

@@ -9,10 +9,10 @@ services:
       db:
         condition: service_healthy
     env_file:
-      - path: .env
+      - path: prod.env
         required: true
     environment:
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:?Variable not set}
+      - ENVIRONMENT=demo
     ports:
       - 8000:8000
     healthcheck:
@@ -25,12 +25,10 @@ services:
       - app-db-data:/var/lib/postgresql/data/pgdata
       - ./database/:/docker-entrypoint-initdb.d/:cached
     env_file:
-      - path: .env
+      - path: prod.env
         required: true
     environment:
       - PGDATA=/var/lib/postgresql/data/pgdata
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:?Variable not set}
-      - SECRET_KEY=${SECRET_KEY:?Variable not set}
     healthcheck:
       test: ["CMD", "pg_isready", "-q", "-d", "tad", "-U", "tad"]
 
@@ -40,16 +38,15 @@ services:
     ports:
       - 8080:8080
     environment:
-      - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL:[email protected]}
-      - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD:?Variable not set}
       - PGADMIN_LISTEN_PORT=${PGADMIN_LISTEN_PORT:-8080}
+    env_file:
+      - path: prod.env
+        required: true
     depends_on:
       db:
         condition: service_healthy
     healthcheck:
       test: ["CMD", "wget", "-O", "-", "http://localhost:8080/misc/ping"]
 
-#TODO(berry): Traefik
-
 volumes:
   app-db-data:

database/init-user-db.sh

@@ -4,6 +4,5 @@ set -e
 # todo(berry): make user and database variables
 psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
 	CREATE USER tad WITH PASSWORD 'changethis';
-	CREATE DATABASE tad;
-	GRANT ALL PRIVILEGES ON DATABASE tad TO tad;
+	CREATE DATABASE tad OWNER tad;
 EOSQL

docker-entrypoint.sh

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+DATABASE_MIGRATE=""
+HOST="0.0.0.0"
+LOGLEVEL="warning"
+PORT="8000"
+
+while getopts "dh:l:p:" opt; do
+    case $opt in
+        d)
+            DATABASE_MIGRATE="True"
+            ;;
+        h)
+            HOST=$OPTARG
+            ;;
+        l)
+            LOGLEVEL=$OPTARG
+            ;;
+        p)
+            PORT=$OPTARG
+            ;;
+        :)
+            echo "Option -${OPTARG} requires an argument."
+            exit 1
+            ;;
+
+        ?)
+            echo "Invalid option: $OPTARG"
+
+            echo "Usage: docker-entrypoint.sh [-d] [-h host] [-l loglevel]"
+            exit 1
+            ;;
+    esac
+done
+
+echo "DATABASE_MIGRATE: $DATABASE_MIGRATE"
+echo "HOST: $HOST"
+echo "LOGLEVEL: $LOGLEVEL"
+echo "PORT: $PORT"
+
+
+if [ -z $DATABASE_MIGRATE ]; then
+    echo "Upgrading database"
+    if ! alembic upgrade head; then
+        echo "Failed to upgrade database"
+        exit 1
+    fi
+fi
+
+echo "Starting server"
+python -m uvicorn --host "$HOST" tad.main:app --port "$PORT" --log-level "$LOGLEVEL"