From a8943b4a8ff30055e05c0d7d8aff8ef385ed468a Mon Sep 17 00:00:00 2001
From: Marijn Doeve <marijn@doeve.me>
Date: Mon, 21 Aug 2023 18:08:27 +0200
Subject: [PATCH] Better config

---
 .dockerignore         |  2 ++
 .gitignore            |  2 ++
 Containerfile         | 18 +++++++++++-------
 compose.override.yaml |  6 ------
 compose.yaml          |  2 +-
 5 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 .dockerignore
 delete mode 100644 compose.override.yaml

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..d646835
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+*.pyc
+__pycache__/
diff --git a/.gitignore b/.gitignore
index ff1d379..3976020 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+compose.override.yaml
+
 ### Generated by gibo (https://github.com/simonwhitaker/gibo)
 ### https://raw.github.com/github/gitignore/4488915eec0b3a45b5c63ead28f286819c0917de/Global/macOS.gitignore
 
diff --git a/Containerfile b/Containerfile
index ef7729c..c9e55c7 100644
--- a/Containerfile
+++ b/Containerfile
@@ -2,17 +2,21 @@ FROM docker.io/python:3.11-slim AS base
 
 WORKDIR /app
 
-RUN apt-get update && apt-get install -y build-essential
-
-ADD requirements.txt ./
-RUN pip3 install -r requirements.txt
-
 FROM base as dev
 
-CMD [ "poerty", "run", "uvicorn", "projectorpi_web.app:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]
+RUN pip3 install poetry
+
+CMD [ "uvicorn", "projectorpi_web.app:app", "--host", "0.0.0.0", "--port", "8000", "--reload"]
 
 FROM base as prod
 
+ADD requirements.txt ./
+
+RUN apt-get update && apt-get install -y build-essential \
+    && pip install --upgrade pip \
+    && pip3 install -r requirements.txt \
+    && apt-get remove -y build-essential
+
 ADD projectorpi_web/* ./
 
-CMD gunicorn -w 4 -k uvicorn.workers.UvicornWorker --bind 0.0.0.0:8000 app:app
+CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "80" ]
diff --git a/compose.override.yaml b/compose.override.yaml
deleted file mode 100644
index 08b8eb3..0000000
--- a/compose.override.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
-  app:
-    build:
-      target: dev
-    volumes:
-      - .:/app
diff --git a/compose.yaml b/compose.yaml
index dfeff1c..c4bfb12 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -5,7 +5,7 @@ services:
       context: .
       target: prod
     ports:
-      - "80:8000"
+      - "80:80"
     privileged: True
     volumes:
       - "/dev/serial/by-id:/dev/serial/by-id"