re-dockerise the api and database

Author: AbstractUmbra

docker-compose.yaml

@@ -2,27 +2,27 @@ version: "3.7"
 
 services:
   api:
-    image: python:3.9.1-buster
-    build: mystbin/rest
+    build: mystbin/backend
     ports:
       - 127.0.0.1:5557:9000/tcp
     volumes:
       - ./mystbin/database/schema.sql:/etc/schema.sql:ro
       - ./config.json:/usr/src/app/config.json:ro
-    container_name: "staging-api"
+    container_name: "mystbin-api"
     networks:
       main:
         ipv4_address: 172.25.0.11
     depends_on:
       - database
 
   database:
-    image: postgres:13-alpine
+    image: postgres:14-alpine
     ports:
       - 127.0.0.1:5558:5432
-    container_name: "staging-database"
+    container_name: "mystbin-database"
     volumes:
       - postgresdata:/var/lib/postgresql/data/pgdata
+      - ./mystbin/database/schema.sql:/docker-entrypoint-initdb.d/schema.sql:ro
     environment:
       POSTGRES_DB: mystbin
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
@@ -40,7 +40,7 @@ services:
       - ./config.json:/app/config.json:ro
     ports:
       - 127.0.0.1:5559:3000
-    container_name: "staging-frontend"
+    container_name: "mystbin-frontend"
     build: ./mystbin/frontend
     depends_on:
       - api

mystbin/backend/Dockerfile

@@ -1,9 +1,9 @@
-FROM python:3.9.1-buster
+FROM python:3.9-slim
 
 WORKDIR /usr/src/app
 
 COPY . ./
 RUN pip install --no-cache-dir -U -r requirements.txt
 ENV ISDOCKER=true
 
-CMD ["python", "main.py"]
+CMD ["python", "-m", "uvicorn", "app:app", "--host", "0.0.0.0", "--port", "9000"]

mystbin/backend/requirements.txt

@@ -10,8 +10,8 @@ sentry-sdk==1.5.3
 starlette-prometheus==0.9.0
 typing-extensions==4.0.1
 ujson==5.1.0
-uvicorn[standard]==0.17.0
+uvicorn[standard]==0.18.0
 yarl
 aioconsole
 tabulate
-aioredis>2<3
+aioredis>2<3