From d3ef9c9bc09431e2c1deba52286b797a1d552508 Mon Sep 17 00:00:00 2001
From: Hayden <hay-kot@pm.me>
Date: Sat, 16 Jan 2021 15:43:37 -0900
Subject: [PATCH] arm support

---
 Dockerfile     |  8 +++++++-
 Dockerfile.arm |  3 ++-
 poetry.lock    | 29 +----------------------------
 pyproject.toml |  2 --
 4 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index aa294862e..314525470 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,9 +14,15 @@ WORKDIR /app
 RUN apt-get update -y && \
     apt-get install -y python-pip python-dev git --no-install-recommends && \
     rm -rf /var/lib/apt/lists/* && \
-    pip install -r requirements.txt 
+    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 ./pyproject.toml ./app/poetry.lock* /app/
 
 COPY ./mealie /app
+RUN poetry install --no-root -no-dev
 COPY --from=build-stage /app/dist /app/dist
 RUN rm -rf /app/test /app/.temp
 
diff --git a/Dockerfile.arm b/Dockerfile.arm
index 4230768c7..01063984e 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -16,10 +16,11 @@ RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-
     cd /usr/local/bin && \
     ln -s /opt/poetry/bin/poetry && \
     poetry config virtualenvs.create false
-    
+
 COPY ./pyproject.toml ./app/poetry.lock* /app/
 
 COPY ./mealie /app
+RUN poetry install --no-root
 COPY --from=build-stage /app/dist /app/dist
 RUN rm -rf /app/test /app/.temp
 
diff --git a/poetry.lock b/poetry.lock
index 599948bc1..50190205d 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -725,25 +725,6 @@ category = "main"
 optional = false
 python-versions = "*"
 
-[[package]]
-name = "tinydb"
-version = "4.3.0"
-description = "TinyDB is a tiny, document oriented database optimized for your happiness :)"
-category = "main"
-optional = false
-python-versions = ">=3.5,<4.0"
-
-[[package]]
-name = "tinydb-serialization"
-version = "2.0.0"
-description = "Serialization for objects that TinyDB otherwise couldn't handle"
-category = "main"
-optional = false
-python-versions = ">=3.5,<4.0"
-
-[package.dependencies]
-tinydb = ">=4.0,<5.0"
-
 [[package]]
 name = "toml"
 version = "0.10.2"
@@ -883,7 +864,7 @@ python-versions = "*"
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.8"
-content-hash = "e6de00d8bb8d6433c6558113ff966531e134d24c63f1aeb779fb295384ab66c2"
+content-hash = "41e74af4ccdf3d291de04842718297a83774c80da335894e1eb0fcacb0fddac5"
 
 [metadata.files]
 aiofiles = [
@@ -1392,14 +1373,6 @@ text-unidecode = [
     {file = "text-unidecode-1.3.tar.gz", hash = "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93"},
     {file = "text_unidecode-1.3-py2.py3-none-any.whl", hash = "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8"},
 ]
-tinydb = [
-    {file = "tinydb-4.3.0-py3-none-any.whl", hash = "sha256:c8a8887269927e077f3aa16fddbf4debd176c10edc4ac8a5ce48ced0b10adf8c"},
-    {file = "tinydb-4.3.0.tar.gz", hash = "sha256:1d102d06f9bb22d739d8061b490c64d420de70dca5f95ebd43a492c43c7bd303"},
-]
-tinydb-serialization = [
-    {file = "tinydb-serialization-2.0.0.tar.gz", hash = "sha256:02d5ebc54652a38c52976658c1d25732112afb5ebbc4c0b730b3abef4b121b59"},
-    {file = "tinydb_serialization-2.0.0-py3-none-any.whl", hash = "sha256:d1bed979e1566452b51ea065942e1208ea751285064ebb56bbab52e2ffbf3100"},
-]
 toml = [
     {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
     {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
diff --git a/pyproject.toml b/pyproject.toml
index edf936c98..b443b13e1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -21,8 +21,6 @@ SQLAlchemy = "^1.3.22"
 Jinja2 = "^2.11.2"
 python-dotenv = "^0.15.0"
 mongoengine = "^0.22.1"
-tinydb = "^4.3.0"
-tinydb-serialization = "^2.0.0"
 python-slugify = "^4.0.1"
 requests = "^2.25.1"
 PyYAML = "^5.3.1"