From 50c31b93a637fd552c63a56438401b72dacf4771 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Wed, 23 Oct 2024 10:26:33 +0200
Subject: [PATCH] push to 2.0.0

---
 Containerfile | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Containerfile b/Containerfile
index 3c022cd..19815b3 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,4 +1,4 @@
-FROM docker.io/alpine:3.19 AS builder
+FROM docker.io/alpine:3.20 AS builder
 
 ENV POETRY_VIRTUALENVS_IN_PROJECT=true
 ENV POETRY_NO_INTERACTION=1
@@ -22,14 +22,14 @@ RUN apk --no-cache add \
   sed \
   libffi-dev
 
-ENV VERSION=13edefbf4168ee56f12a1ab5d9d1358094772b09
+ENV VERSION=v2.0.0
 
 RUN git clone https://github.com/mealie-recipes/mealie.git
 WORKDIR /mealie
 RUN git checkout $VERSION
 RUN poetry install -E pgsql --only main
 RUN find .venv/bin -type f -exec grep -lZ "^#!/mealie/.venv/bin/python" {} + | xargs -0 -I {} sed -i "1s|^#!/mealie/.venv/bin/python|#!/py-pkgs/bin/python|" {}
-RUN echo "/home/mealie/app/" > /mealie/.venv/lib/python3.11/site-packages/mealie.pth
+RUN echo "/home/mealie/app/" > /mealie/.venv/lib/python3.12/site-packages/mealie.pth
 
 WORKDIR /mealie/frontend
 RUN yarn install \
@@ -41,7 +41,7 @@ RUN yarn install \
     --ignore-engines
 RUN echo "n" | yarn generate
 
-FROM docker.io/alpine:3.19 as crfpp
+FROM docker.io/alpine:3.20 as crfpp
 
 ENV VERSION=c56dd9f29469c8a9f34456b8c0d6ae0476110516
 
@@ -60,7 +60,7 @@ RUN ./configure --prefix=/
 RUN make
 RUN make DESTDIR=/dist install
 
-FROM docker.io/alpine:3.19
+FROM docker.io/alpine:3.20
 
 ENV PRODUCTION=true
 ENV TESTING=false
@@ -75,14 +75,12 @@ RUN apk add --no-cache \
   python3 \
   libldap \
   zlib \
-  jpeg \
-  py3-gunicorn
+  jpeg
 
 COPY --from=crfpp /dist/bin /bin/
 COPY --from=crfpp /dist/lib /lib/
 COPY --from=builder --chown=mealie:mealie /mealie/.venv /py-pkgs
 COPY --from=builder --chown=mealie:mealie /mealie/mealie /home/mealie/app/mealie
-COPY --from=builder --chown=mealie:mealie /mealie/gunicorn_conf.py /home/mealie/app/gunicorn_conf.py
 COPY --from=builder --chown=mealie:mealie /mealie/alembic.ini /home/mealie/app/alembic.ini
 COPY --from=builder --chown=mealie:mealie /mealie/alembic /home/mealie/app/alembic
 COPY --from=builder --chown=mealie:mealie /mealie/frontend/dist /home/mealie/app/static
@@ -96,6 +94,9 @@ USER mealie
 
 RUN /py-pkgs/bin/python /home/mealie/app/mealie/scripts/install_model.py
 
+ENV APP_PORT=9000
+ENV HOST=0.0.0.0
+
 EXPOSE 9000
 VOLUME ["/app/data"]
-CMD ["uvicorn", "mealie.app:app", "--host", "0.0.0.0", "--port", "9000"]
+CMD ["python3", "mealie/main.py"]