From 4c3207f64d69c76b7954b2745205a57d837e3548 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 12 Oct 2024 13:40:26 +0200
Subject: [PATCH 1/6] Update config.json

---
 zzz_test/config.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zzz_test/config.json b/zzz_test/config.json
index 94785ef37..683f190ea 100644
--- a/zzz_test/config.json
+++ b/zzz_test/config.json
@@ -112,6 +112,6 @@
   "slug": "test",
   "udev": true,
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "v2.0-beta_ingress_test",
+  "version": "v2.0-beta_ingress_test2",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:9001]"
-}
\ No newline at end of file
+}

From 0e5f1905afb8c3c7f16531e071b13b770fd393a8 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 12 Oct 2024 11:41:25 +0000
Subject: [PATCH 2/6] GitHub bot : scripts executable

---
 zzz_test/rootfs/etc/cont-init.d/31-nginx.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 zzz_test/rootfs/etc/cont-init.d/31-nginx.sh

diff --git a/zzz_test/rootfs/etc/cont-init.d/31-nginx.sh b/zzz_test/rootfs/etc/cont-init.d/31-nginx.sh
old mode 100644
new mode 100755

From a934659e1160d13d403b785b446637d964fb1aa0 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 12 Oct 2024 13:46:57 +0200
Subject: [PATCH 3/6] Update Dockerfile

---
 zzz_test/Dockerfile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/zzz_test/Dockerfile b/zzz_test/Dockerfile
index 66f31a029..6cf2d5b19 100644
--- a/zzz_test/Dockerfile
+++ b/zzz_test/Dockerfile
@@ -63,7 +63,7 @@ RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.
 ###############################################
 
 # Define build arguments for SUB_PATH
-ARG SUB_PATH=/mealie_path/
+ARG SUB_PATH=/hllo/
 ENV SUB_PATH=${SUB_PATH}
 
 # Frontend Builder Stage
@@ -271,4 +271,7 @@ LABEL \
 
 #################
 # 9 Healthcheck #
-#################
\ No newline at end of file
+#################
+
+# Assuming healthcheck is already defined in Mealie Production Stage
+# If additional healthchecks are needed, add them here.

From de3b601c9d1a2d0e68ca70887db1aeb29e6008a5 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 12 Oct 2024 13:47:07 +0200
Subject: [PATCH 4/6] Update config.json

---
 zzz_test/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zzz_test/config.json b/zzz_test/config.json
index 683f190ea..37570c256 100644
--- a/zzz_test/config.json
+++ b/zzz_test/config.json
@@ -112,6 +112,6 @@
   "slug": "test",
   "udev": true,
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "v2.0-beta_ingress_test2",
+  "version": "v2.0-beta_ingress_test3",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:9001]"
 }

From d4fae6bf4c9d6aa63ed2c83730500abbbd6be3d1 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 12 Oct 2024 13:57:41 +0200
Subject: [PATCH 5/6] Update Dockerfile

---
 zzz_test/Dockerfile | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/zzz_test/Dockerfile b/zzz_test/Dockerfile
index 6cf2d5b19..f3a880850 100644
--- a/zzz_test/Dockerfile
+++ b/zzz_test/Dockerfile
@@ -39,7 +39,7 @@ RUN grep -rl "/app/data" /app | xargs sed -i 's|/app/data|/config/addons_config/
 # Add rootfs
 COPY rootfs/ /
 
-# Uses /bin for compatibility purposes
+# Ensure /bin/sh and /bin/bash exist for compatibility
 # hadolint ignore=DL4005
 RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \
     if [ ! -f /bin/bash ] && [ -f /usr/bin/bash ]; then ln -s /usr/bin/bash /bin/bash; fi
@@ -113,7 +113,7 @@ ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
 # Create user account
 RUN useradd -u 911 -U -d $MEALIE_HOME -s /bin/bash abc \
     && usermod -G users abc \
-    && mkdir $MEALIE_HOME
+    && mkdir -p $MEALIE_HOME
 
 # Builder Base Image
 FROM mealie-python-base AS mealie-builder-base
@@ -225,18 +225,12 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
 ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh"
 RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh
 
-# Modify run.sh for ARMv7
-RUN \
-    # Add custom instructions to run.sh on armv7
-    sed -i '1d' /app/run.sh \
-    && cat /app/run.sh >> /run.txt \
-    && cat /run.txt > /app/run.sh \
-    && chmod +x /app/run.sh
+# Download and set the entry.sh from Mealie repository
+ADD "https://raw.githubusercontent.com/mealie-recipes/mealie/mealie-next/docker/entry.sh" "/app/run.sh"
 
-# Copy and set entrypoint script
-COPY ./docker/entry.sh $MEALIE_HOME/run.sh
+# Ensure the entry.sh is executable
+RUN chmod +x /app/run.sh
 
-RUN chmod +x $MEALIE_HOME/run.sh
 ENTRYPOINT ["/app/run.sh"]
 
 ############
@@ -273,5 +267,5 @@ LABEL \
 # 9 Healthcheck #
 #################
 
-# Assuming healthcheck is already defined in Mealie Production Stage
+# Healthcheck is already defined earlier in the production stage
 # If additional healthchecks are needed, add them here.

From 70d45611916a80c2b4f0ff2b0281dcfad35eb647 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Sat, 12 Oct 2024 13:57:52 +0200
Subject: [PATCH 6/6] Update config.json

---
 zzz_test/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zzz_test/config.json b/zzz_test/config.json
index 37570c256..8ea6c139d 100644
--- a/zzz_test/config.json
+++ b/zzz_test/config.json
@@ -112,6 +112,6 @@
   "slug": "test",
   "udev": true,
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "v2.0-beta_ingress_test3",
+  "version": "v2.0-beta_ingress_test4",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:9001]"
 }