dockerfile hotfix

2025-12-01 16:14:21 -05:00 · 2021-01-16 16:50:37 -09:00
parent cf45fa0015
commit 6bc7c4ceb0
6 changed files with 41 additions and 149 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,3 @@
 */node_modules
 */dist
+*/data/db
--- a/.gitignore
+++ b/.gitignore
@@ -152,130 +152,4 @@ ENV/
 # Node Modules
 node_modules/
 mealie/data/debug/last_recipe.json
-mealie/data/temp/active_import/images/.gitkeep
-mealie/data/temp/active_import/images/banana-bread.jpg
-mealie/data/temp/active_import/images/bon-appetit-s-perfect-pizza.jpg
-mealie/data/temp/active_import/images/braised-beans-and-sardines-with-fennel.jpg
-mealie/data/temp/active_import/images/broccoli-beer-cheese-soup.jpg
-mealie/data/temp/active_import/images/buttery-kimchi-chicken.jpg
-mealie/data/temp/active_import/images/cauliflower-cacciatore.jpg
-mealie/data/temp/active_import/images/chicken-salad-with-citrus-and-chile-oil.jpg
-mealie/data/temp/active_import/images/coffee-hazelnut-biscotti.jpg
-mealie/data/temp/active_import/images/corn-and-crab-beignets-with-yaji-aioli.jpg
-mealie/data/temp/active_import/images/crispy-carrots.jpg
-mealie/data/temp/active_import/images/crispy-rice-with-ginger-citrus-celery-salad.jpg
-mealie/data/temp/active_import/images/crockpot-buffalo-chicken.jpg
-mealie/data/temp/active_import/images/detroit-style-pepperoni-pizza.jpg
-mealie/data/temp/active_import/images/downtown-marinade.jpg
-mealie/data/temp/active_import/images/falafel-hummus-plate.jpg
-mealie/data/temp/active_import/images/five-spice-popcorn-chicken.jpg
-mealie/data/temp/active_import/images/ginger-citrus-cookies.jpg
-mealie/data/temp/active_import/images/green-chile-stew.jpg
-mealie/data/temp/active_import/images/green-seasoning-baked-cod.jpg
-mealie/data/temp/active_import/images/green-spaghetti.jpg
-mealie/data/temp/active_import/images/huevos-rancheros-con-rajas-y-champinones.jpg
-mealie/data/temp/active_import/images/jalapeno-cornbread.jpg
-mealie/data/temp/active_import/images/marinated-tofu-with-brussels-sprouts-and-farro.jpg
-mealie/data/temp/active_import/images/marranitos-enfiestados.jpg
-mealie/data/temp/active_import/images/mississippi-pot-roast.jpg
-mealie/data/temp/active_import/images/mushroom-risotto.jpg
-mealie/data/temp/active_import/images/new-york-strip.jpg
-mealie/data/temp/active_import/images/nilla-wafer-french-toast.jpg
-mealie/data/temp/active_import/images/one-minute-muffin.jpg
-mealie/data/temp/active_import/images/one-pot-chicken-and-rice.jpg
-mealie/data/temp/active_import/images/pace-pork.jpg
-mealie/data/temp/active_import/images/pasta-with-mushrooms-and-cashew-cream.jpg
-mealie/data/temp/active_import/images/pizzettes.jpg
-mealie/data/temp/active_import/images/pork-steaks.jpg
-mealie/data/temp/active_import/images/roasted-brussels-sprouts.jpg
-mealie/data/temp/active_import/images/roasted-okra.jpg
-mealie/data/temp/active_import/images/salt-vinegar-potatoes.jpg
-mealie/data/temp/active_import/images/shrimp-and-cabbage-curry.jpg
-mealie/data/temp/active_import/images/smashed-carrots.jpg
-mealie/data/temp/active_import/images/tamarind-chicken-thighs-with-collard-greens-salad.jpg
-mealie/data/temp/active_import/images/tequila-beer-and-citrus-cocktail.jpg
-mealie/data/temp/active_import/recipes/banana-bread.json
-mealie/data/temp/active_import/recipes/bon-appetit-s-perfect-pizza.json
-mealie/data/temp/active_import/recipes/braised-beans-and-sardines-with-fennel.json
-mealie/data/temp/active_import/recipes/broccoli-beer-cheese-soup.json
-mealie/data/temp/active_import/recipes/buttery-kimchi-chicken.json
-mealie/data/temp/active_import/recipes/cauliflower-cacciatore.json
-mealie/data/temp/active_import/recipes/chicken-salad-with-citrus-and-chile-oil.json
-mealie/data/temp/active_import/recipes/coffee-hazelnut-biscotti.json
-mealie/data/temp/active_import/recipes/corn-and-crab-beignets-with-yaji-aioli.json
-mealie/data/temp/active_import/recipes/crispy-carrots.json
-mealie/data/temp/active_import/recipes/crispy-rice-with-ginger-citrus-celery-salad.json
-mealie/data/temp/active_import/recipes/crockpot-buffalo-chicken.json
-mealie/data/temp/active_import/recipes/detroit-style-pepperoni-pizza.json
-mealie/data/temp/active_import/recipes/downtown-marinade.json
-mealie/data/temp/active_import/recipes/falafel-hummus-plate.json
-mealie/data/temp/active_import/recipes/five-spice-popcorn-chicken.json
-mealie/data/temp/active_import/recipes/ginger-citrus-cookies.json
-mealie/data/temp/active_import/recipes/green-chile-stew.json
-mealie/data/temp/active_import/recipes/green-seasoning-baked-cod.json
-mealie/data/temp/active_import/recipes/green-spaghetti.json
-mealie/data/temp/active_import/recipes/huevos-rancheros-con-rajas-y-champinones.json
-mealie/data/temp/active_import/recipes/jalapeno-cornbread.json
-mealie/data/temp/active_import/recipes/marinated-tofu-with-brussels-sprouts-and-farro.json
-mealie/data/temp/active_import/recipes/marranitos-enfiestados.json
-mealie/data/temp/active_import/recipes/mississippi-pot-roast.json
-mealie/data/temp/active_import/recipes/mushroom-risotto.json
-mealie/data/temp/active_import/recipes/new-york-strip.json
-mealie/data/temp/active_import/recipes/nilla-wafer-french-toast.json
-mealie/data/temp/active_import/recipes/one-minute-muffin.json
-mealie/data/temp/active_import/recipes/one-pot-chicken-and-rice.json
-mealie/data/temp/active_import/recipes/pace-pork.json
-mealie/data/temp/active_import/recipes/pasta-with-mushrooms-and-cashew-cream.json
-mealie/data/temp/active_import/recipes/pizzettes.json
-mealie/data/temp/active_import/recipes/pork-steaks.json
-mealie/data/temp/active_import/recipes/roasted-brussels-sprouts.json
-mealie/data/temp/active_import/recipes/roasted-okra.json
-mealie/data/temp/active_import/recipes/salt-vinegar-potatoes.json
-mealie/data/temp/active_import/recipes/shrimp-and-cabbage-curry.json
-mealie/data/temp/active_import/recipes/smashed-carrots.json
-mealie/data/temp/active_import/recipes/tamarind-chicken-thighs-with-collard-greens-salad.json
-mealie/data/temp/active_import/recipes/tequila-beer-and-citrus-cocktail.json
-mealie/data/temp/active_import/settings/settings.json
-mealie/data/temp/active_import/templates/Banana Bread.md
-mealie/data/temp/active_import/templates/Bon Appétit's Perfect Pizza.md
-mealie/data/temp/active_import/templates/Braised Beans and Sardines With Fennel.md
-mealie/data/temp/active_import/templates/Broccoli Beer Cheese Soup.md
-mealie/data/temp/active_import/templates/Buttery Kimchi Chicken.md
-mealie/data/temp/active_import/templates/Cauliflower Cacciatore.md
-mealie/data/temp/active_import/templates/Chicken Salad With Citrus and Chile Oil.md
-mealie/data/temp/active_import/templates/Coffee-Hazelnut Biscotti.md
-mealie/data/temp/active_import/templates/Corn and Crab Beignets With Yaji Aioli.md
-mealie/data/temp/active_import/templates/Crispy Carrots.md
-mealie/data/temp/active_import/templates/Crispy Rice With Ginger-Citrus Celery Salad.md
-mealie/data/temp/active_import/templates/Crockpot Buffalo Chicken.md
-mealie/data/temp/active_import/templates/Detroit-Style Pepperoni Pizza.md
-mealie/data/temp/active_import/templates/Downtown Marinade.md
-mealie/data/temp/active_import/templates/Falafel-Hummus Plate.md
-mealie/data/temp/active_import/templates/Five Spice Popcorn Chicken.md
-mealie/data/temp/active_import/templates/Ginger-Citrus Cookies.md
-mealie/data/temp/active_import/templates/Green Chile Stew.md
-mealie/data/temp/active_import/templates/Green Seasoning Baked Cod.md
-mealie/data/temp/active_import/templates/Green Spaghetti.md
-mealie/data/temp/active_import/templates/Huevos Rancheros con Rajas y Champiñones.md
-mealie/data/temp/active_import/templates/Jalapeno Cornbread.md
-mealie/data/temp/active_import/templates/Marinated Tofu With Brussels Sprouts and Farro.md
-mealie/data/temp/active_import/templates/Marranitos Enfiestados.md
-mealie/data/temp/active_import/templates/Mississippi Pot Roast.md
-mealie/data/temp/active_import/templates/Mushroom Risotto.md
-mealie/data/temp/active_import/templates/New York Strip.md
-mealie/data/temp/active_import/templates/Nilla Wafer French Toast.md
-mealie/data/temp/active_import/templates/One Minute Muffin.md
-mealie/data/temp/active_import/templates/One-Pot Chicken and Rice.md
-mealie/data/temp/active_import/templates/Pace Pork.md
-mealie/data/temp/active_import/templates/Pasta With Mushrooms and Cashew Cream.md
-mealie/data/temp/active_import/templates/Pizzettes.md
-mealie/data/temp/active_import/templates/Pork Steaks.md
-mealie/data/temp/active_import/templates/Roasted Brussels Sprouts.md
-mealie/data/temp/active_import/templates/Roasted Okra.md
-mealie/data/temp/active_import/templates/Salt & Vinegar Potatoes.md
-mealie/data/temp/active_import/templates/Shrimp and Cabbage Curry.md
-mealie/data/temp/active_import/templates/Smashed Carrots.md
-mealie/data/temp/active_import/templates/Tamarind Chicken Thighs With Collard Greens Salad.md
-mealie/data/temp/active_import/templates/Tequila, Beer, and Citrus Cocktail.md
-mealie/data/temp/active_import/themes/themes.json
-mealie/data/mealie.sqlite
+*.sqlite
--- a/4
+++ b/4
@@ -12,7 +12,7 @@ COPY ./requirements.txt /app/requirements.txt
 WORKDIR /app

 RUN apt-get update -y && \
-    apt-get install -y python-pip python-dev git --no-install-recommends && \
+    apt-get install -y python-pip python-dev git curl --no-install-recommends && \
    rm -rf /var/lib/apt/lists/* && \
    curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | POETRY_HOME=/opt/poetry python && \
    cd /usr/local/bin && \
@@ -22,7 +22,7 @@ RUN apt-get update -y && \
 COPY ./pyproject.toml ./app/poetry.lock* /app/

 COPY ./mealie /app
-RUN poetry install --no-root -no-dev
+RUN poetry install --no-root --no-dev
 COPY --from=build-stage /app/dist /app/dist
 RUN rm -rf /app/test /app/.temp

--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -12,6 +12,9 @@ COPY ./requirements.txt /app/requirements.txt

 WORKDIR /app

+RUN apt-get update -y && \
+    apt-get install -y python-pip python-dev git curl --no-install-recommends && \
+
 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 && \
@@ -20,7 +23,7 @@ RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-
 COPY ./pyproject.toml ./app/poetry.lock* /app/

 COPY ./mealie /app
-RUN poetry install --no-root
+RUN poetry install --no-root --no-dev
 COPY --from=build-stage /app/dist /app/dist
 RUN rm -rf /app/test /app/.temp

--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-# Use root/example as user/password credentials
-# Frontend/Backend Served via the same Uvicorn Server
 version: "3.1"
 services:
  mealie:
@@ -11,23 +9,24 @@ services:
    ports:
      - 9090:80
    environment:
+      db_type: sql
      db_username: root
      db_password: example
      db_host: mongo
      db_port: 27017
-    volumes:
-      - ./mealie/data/:/app/data
-  mongo:
-    image: mongo
-    restart: always
-    environment:
-      MONGO_INITDB_ROOT_USERNAME: root
-      MONGO_INITDB_ROOT_PASSWORD: example
-  mongo-express: # Optional Mongo GUI
-    image: mongo-express
-    restart: always
-    ports:
-      - 9091:8081
-    environment:
-      ME_CONFIG_MONGODB_ADMINUSERNAME: root
-      ME_CONFIG_MONGODB_ADMINPASSWORD: example
+    # volumes:
+    #   - ./mealie/data/:/app/data
+  # mongo:
+  #   image: mongo
+  #   restart: always
+  #   environment:
+  #     MONGO_INITDB_ROOT_USERNAME: root
+  #     MONGO_INITDB_ROOT_PASSWORD: example
+  # mongo-express: # Optional Mongo GUI
+  #   image: mongo-express
+  #   restart: always
+  #   ports:
+  #     - 9091:8081
+  #   environment:
+  #     ME_CONFIG_MONGODB_ADMINUSERNAME: root
+  #     ME_CONFIG_MONGODB_ADMINPASSWORD: example
--- a/docs/docs/getting-started/install.md
+++ b/docs/docs/getting-started/install.md
@@ -19,6 +19,21 @@ To deploy docker on your local network it is highly recommended to use docker to
 | api_docs       | True    | Turns on/off access to the API documentation locally.                                                                                                   |
 | TZ             |         | You should set your time zone accordingly so the date/time features work correctly                                                                      |

+## Docker CLI
+
+```shell
+docker container run \
+    -e db_type='sql' \
+    -p 9000:80 \
+    -v `pwd`:'/app/data/' \
+    hkotel/mealie:dev
+
+
+```
+
+```shell
+```
+

 ## Docker Compose

@@ -31,7 +46,7 @@ services:
    image: hkotel/mealie:latest
    restart: always
    ports:
-      - 9000:9000
+      - 9000:80
    environment:
      db_username: root     # Your Mongo DB Username - Please Change
      db_password: example  # Your Mongo DB Password - Please Change