From 3d0e38444e4305a313be5fdc9e0587616e686da0 Mon Sep 17 00:00:00 2001
From: hay-kot <hay-kot@pm.me>
Date: Sat, 20 Mar 2021 13:27:03 -0800
Subject: [PATCH] fix failing builds

---
 Dockerfile             | 10 +++++-----
 Dockerfile.dev         | 14 +++++++-------
 docker-compose.dev.yml | 40 ++++++++++++++++++++--------------------
 mealie/run.sh          |  2 +-
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b098e79d5..42ebf796c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,10 +10,11 @@ FROM python:3.9-alpine
 RUN apk add --no-cache libxml2-dev libxslt-dev libxml2 caddy libffi-dev
 ENV ENV prod
 EXPOSE 80
-WORKDIR /app
+WORKDIR /app/
 
 COPY ./pyproject.toml /app/
 
+
 RUN apk add --update --no-cache --virtual .build-deps \
     curl \
     g++ \
@@ -29,13 +30,12 @@ RUN apk add --update --no-cache --virtual .build-deps \
     apk --purge del .build-deps
 
 
-COPY ./mealie /app
+COPY ./mealie /app/mealie
 COPY ./Caddyfile /app
 COPY ./app_data/templates /app/data/templates
-RUN rm -rf /app/tests /app/.temp
 COPY --from=build-stage /app/dist /app/dist
 
 VOLUME [ "/app/data/" ]
-RUN chmod +x /app/run.sh
-CMD /app/run.sh
+RUN chmod +x /app/mealie/run.sh
+CMD /app/mealie/run.sh
 
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 56845551b..693dc8a2d 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,21 +1,21 @@
 FROM python:3
 
+WORKDIR /app/
+
 RUN apt-get update -y && \
     apt-get install -y python-pip python-dev
 
+# Install Poetry
 RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \
     cd /usr/local/bin && \
     ln -s /opt/poetry/bin/poetry && \
     poetry config virtualenvs.create false
 
+# Copy poetry.lock* in case it doesn't exist in the repo
 COPY ./pyproject.toml ./poetry.lock* /app/
 
-WORKDIR /app
+RUN poetry install 
 
-RUN poetry install --no-root
+COPY ./mealie /app/mealie
 
-COPY ./mealie /app
-
-ENTRYPOINT [ "python" ]
-
-CMD [ "app.py" ]
\ No newline at end of file
+CMD ["uvicorn", "mealie.app:app", "--host", "0.0.0.0", "--port", "9000"]
\ No newline at end of file
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index cf73fa8f2..f1b6acc36 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -2,19 +2,19 @@
 version: "3.1"
 services:
   # Vue Frontend
-  mealie-frontend:
-    image: mealie-frontend:dev
-    build:
-      context: ./frontend
-      dockerfile: frontend.Dockerfile
-    restart: always
-    ports:
-      - 9920:8080
-    environment:
-      VUE_APP_API_BASE_URL: "http://mealie-api:9000"
-    volumes:
-      - ./frontend/:/app
-      - /app/node_modules
+  # mealie-frontend:
+  #   image: mealie-frontend:dev
+  #   build:
+  #     context: ./frontend
+  #     dockerfile: frontend.Dockerfile
+  #   restart: always
+  #   ports:
+  #     - 9920:8080
+  #   environment:
+  #     VUE_APP_API_BASE_URL: "http://mealie-api:9000"
+  #   volumes:
+  #     - ./frontend/:/app
+  #     - /app/node_modules
 
   # Fast API
   mealie-api:
@@ -32,11 +32,11 @@ services:
       - ./app_data:/app_data
       - ./mealie:/app
 
-  mealie-docs:
-    image: squidfunk/mkdocs-material
-    restart: always
-    ports:
-      - 9922:8000
-    volumes:
-      - ./docs:/docs
+  # mealie-docs:
+  #   image: squidfunk/mkdocs-material
+  #   restart: always
+  #   ports:
+  #     - 9922:8000
+  #   volumes:
+  #     - ./docs:/docs
 
diff --git a/mealie/run.sh b/mealie/run.sh
index 308be5b8b..f85e29e6a 100644
--- a/mealie/run.sh
+++ b/mealie/run.sh
@@ -9,4 +9,4 @@
 caddy start --config ./Caddyfile
 
 ## Start API
-uvicorn app:app --host 0.0.0.0 --port 9000
\ No newline at end of file
+uvicorn mealie.app:app --host 0.0.0.0 --port 9000
\ No newline at end of file