avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-06-09 09:05:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/alexbelgium/hassio-addons

Browse Source
This commit is contained in:
Alexandre
2024-10-12 14:12:18 +02:00
parent 46cbf60ea6 70d4561191
commit 35bb157820
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
zzz_test/Dockerfile
View File

@@ -39,7 +39,7 @@ RUN grep -rl "/app/data" /app | xargs sed -i 's|/app/data|/config/addons_config/
# Add rootfs # Add rootfs
COPY rootfs/ / COPY rootfs/ /
# Uses /bin for compatibility purposes # Ensure /bin/sh and /bin/bash exist for compatibility
# hadolint ignore=DL4005 # hadolint ignore=DL4005
RUN if [ ! -f /bin/sh ] && [ -f /usr/bin/sh ]; then ln -s /usr/bin/sh /bin/sh; fi && \ 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 if [ ! -f /bin/bash ] && [ -f /usr/bin/bash ]; then ln -s /usr/bin/bash /bin/bash; fi
@@ -63,7 +63,7 @@ RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.
############################################### ###############################################
# Define build arguments for SUB_PATH # Define build arguments for SUB_PATH
ARG SUB_PATH=/mealie_path/ ARG SUB_PATH=/hllo/
ENV SUB_PATH=${SUB_PATH} ENV SUB_PATH=${SUB_PATH}
# Frontend Builder Stage # Frontend Builder Stage
@@ -113,7 +113,7 @@ ENV PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
# Create user account # Create user account
RUN useradd -u 911 -U -d $MEALIE_HOME -s /bin/bash abc \ RUN useradd -u 911 -U -d $MEALIE_HOME -s /bin/bash abc \
&& usermod -G users abc \ && usermod -G users abc \
&& mkdir $MEALIE_HOME && mkdir -p $MEALIE_HOME
# Builder Base Image # Builder Base Image
FROM mealie-python-base AS mealie-builder-base 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" 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 RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh
# Modify run.sh for ARMv7 # Download and set the entry.sh from Mealie repository
RUN \ ADD "https://raw.githubusercontent.com/mealie-recipes/mealie/mealie-next/docker/entry.sh" "/app/run.sh"
# 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
# Copy and set entrypoint script # Ensure the entry.sh is executable
COPY ./docker/entry.sh $MEALIE_HOME/run.sh RUN chmod +x /app/run.sh
RUN chmod +x $MEALIE_HOME/run.sh
ENTRYPOINT ["/app/run.sh"] ENTRYPOINT ["/app/run.sh"]
############ ############
@@ -271,4 +265,7 @@ LABEL \
################# #################
# 9 Healthcheck # # 9 Healthcheck #
################# #################
# Healthcheck is already defined earlier in the production stage
# If additional healthchecks are needed, add them here.

4
zzz_test/config.json
View File

@@ -112,6 +112,6 @@
"slug": "test", "slug": "test",
"udev": true, "udev": true,
"url": "https://github.com/alexbelgium/hassio-addons", "url": "https://github.com/alexbelgium/hassio-addons",
"version": "v2.0-beta_ingress_test", "version": "v2.0-beta_ingress_test4",
"webui": "[PROTO:ssl]://[HOST]:[PORT:9001]" "webui": "[PROTO:ssl]://[HOST]:[PORT:9001]"
} }

0
zzz_test/rootfs/etc/cont-init.d/31-nginx.sh Normal file → Executable file
View File