diff --git a/mealie_api/CHANGELOG.md b/mealie_api/CHANGELOG.md deleted file mode 100644 index b9129847e..000000000 --- a/mealie_api/CHANGELOG.md +++ /dev/null @@ -1,7 +0,0 @@ - -## v1.0.0-beta-1 (25-12-2022) -- Update to latest version from hay-kot/mealie - -## 1.0.0 (25-12-2022) -- Update to latest version from hay-kot/mealie -- New addon diff --git a/mealie_api/Dockerfile b/mealie_api/Dockerfile deleted file mode 100644 index 41de7a3b0..000000000 --- a/mealie_api/Dockerfile +++ /dev/null @@ -1,109 +0,0 @@ -#============================# -# ALEXBELGIUM'S DOCKERFILE # -#============================# -# _.------. -# _.-` ('>.-`"""-. -# '.--'` _'` _ .--.) -# -' '-.-';` ` -# ' - _.' ``'--. -# '---` .-'""` -# /` -#=== Home Assistant Addon ===# - -################# -# 1 Build Image # -################# - -ARG BUILD_FROM -ARG BUILD_VERSION -ARG BUILD_UPSTREAM="v1.0.0beta-5" -FROM ${BUILD_FROM}${BUILD_UPSTREAM} - -################## -# 2 Modify Image # -################## - -# Set S6 wait time -ENV S6_CMD_WAIT_FOR_SERVICES=1 \ - S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ - S6_SERVICES_GRACETIME=0 - -# Correct data path -# hadolint ignore=DL4006 -RUN grep -rl "/app/data" /app | xargs sed -i 's|/app/data|/config/addons_config/mealie_data|g' - -################## -# 3 Install apps # -################## - -# Add rootfs -COPY rootfs/ / - -# Corrects permissions for s6 v3 -RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ - if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi - -# Modules -ARG MODULES="00-banner.sh 01-custom_script.sh" - -# Automatic modules download -RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d - -# Manual apps -ENV PACKAGES="jq curl bash" - -# Automatic apps & bashio -# hadolint ignore=SC2015 -RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh - -################ -# 4 Entrypoint # -################ - -RUN \ - # Add custom instructions to run.sh - sed -i '1d' /app/mealie/run.sh \ - && cat /app/mealie/run.sh >> /run.txt \ - && cat /run.txt > /app/mealie/run.sh \ - && chmod +x /app/mealie/run.sh - -############ -# 5 Labels # -############ - -ARG BUILD_ARCH -ARG BUILD_DATE -ARG BUILD_DESCRIPTION -ARG BUILD_NAME -ARG BUILD_REF -ARG BUILD_REPOSITORY -ARG BUILD_VERSION -LABEL \ - io.hass.name="${BUILD_NAME}" \ - io.hass.description="${BUILD_DESCRIPTION}" \ - io.hass.arch="${BUILD_ARCH}" \ - io.hass.type="addon" \ - io.hass.version=${BUILD_VERSION} \ - maintainer="alexbelgium (https://github.com/alexbelgium)" \ - org.opencontainers.image.title="${BUILD_NAME}" \ - org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ - org.opencontainers.image.vendor="Home Assistant Add-ons" \ - org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.url="https://github.com/alexbelgium" \ - org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ - org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ - org.opencontainers.image.created=${BUILD_DATE} \ - org.opencontainers.image.revision=${BUILD_REF} \ - org.opencontainers.image.version=${BUILD_VERSION} diff --git a/mealie_api/README.md b/mealie_api/README.md deleted file mode 100644 index 6638ce580..000000000 --- a/mealie_api/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Obsolete - -The dev has now published an all-in-one image! Therefore, I'm cancelling the separate api/frontend addons and moving back to the original one. It now comprises both API and frontend, and exposes both on different ports. - -As before, you can export your database, log to the new addon, then reimport it. Perhaps it could work straight out of the box as the data path stays the same diff --git a/mealie_api/apparmor.txt b/mealie_api/apparmor.txt deleted file mode 100644 index 1d600a50e..000000000 --- a/mealie_api/apparmor.txt +++ /dev/null @@ -1,58 +0,0 @@ -#include - -profile mealie_api_addon flags=(attach_disconnected,mediate_deleted) { - #include - - capability, - file, - signal, - mount, - umount, - remount, - network udp, - network tcp, - network dgram, - network stream, - network inet, - network inet6, - network netlink raw, - network unix dgram, - capability setgid, - capability setuid, - - -# S6-Overlay - /init ix, - /run/{s6,s6-rc*,service}/** ix, - /package/** ix, - /command/** ix, - /run/{,**} rwk, - /dev/tty rw, - /bin/** ix, - /usr/bin/** ix, - /usr/lib/bashio/** ix, - /etc/s6/** rix, - /run/s6/** rix, - /etc/services.d/** rwix, - /etc/cont-init.d/** rwix, - /etc/cont-finish.d/** rwix, - /init rix, - /var/run/** mrwkl, - /var/run/ mrwkl, - /dev/i2c-1 mrwkl, - /dev/sda1 mrwkl, - /dev/sdb1 mrwkl, - /dev/nvme0 mrwkl, - /dev/nvme1 mrwkl, - /dev/mmcblk0p1 mrwkl, - - # Data access - /data/** rw, - - # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container - ptrace (trace,read) peer=docker-default, - - # docker daemon confinement requires explict allow rule for signal - signal (receive) set=(kill,term) peer=/usr/bin/docker, - -} diff --git a/mealie_api/build.json b/mealie_api/build.json deleted file mode 100644 index f6dc5a975..000000000 --- a/mealie_api/build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "build_from": { - "aarch64": "hkotel/mealie:api-", - "amd64": "hkotel/mealie:api-" - }, - "codenotary": { - "signer": "alexandrep.github@gmail.com" - } -} diff --git a/mealie_api/config.json b/mealie_api/config.json deleted file mode 100644 index c9a042742..000000000 --- a/mealie_api/config.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "arch": [ - "aarch64", - "amd64" - ], - "codenotary": "alexandrep.github@gmail.com", - "description": "A Self Hosted Recipe Manager (API)", - "environment": { - "DB_ENGINE": "sqlite", - "WEB_GUNICORN": "true" - }, - "image": "ghcr.io/alexbelgium/mealie_api-{arch}", - "map": [ - "config:rw", - "share:rw", - "ssl:rw" - ], - "name": "Obsolete : Mealie API", - "options": { - "PGID": 1000, - "PUID": 1000, - "certfile": "fullchain.pem", - "keyfile": "privkey.pem", - "ssl": false - }, - "panel_icon": "mdi:silverware-fork-knife", - "ports": { - "9000/tcp": 9000 - }, - "ports_description": { - "9000/tcp": "API port" - }, - "schema": { - "BASE_URL": "str?", - "PGID": "int", - "PUID": "int", - "certfile": "str", - "keyfile": "str", - "ssl": "bool" - }, - "slug": "mealie_api", - "url": "https://github.com/alexbelgium/hassio-addons", - "version": "v1.0.0-beta-3", - "webui": "[PROTO:ssl]://[HOST]:[PORT:9000]" -} diff --git a/mealie_api/icon.png b/mealie_api/icon.png deleted file mode 100644 index 003c2a0d1..000000000 Binary files a/mealie_api/icon.png and /dev/null differ diff --git a/mealie_api/logo.png b/mealie_api/logo.png deleted file mode 100644 index 003c2a0d1..000000000 Binary files a/mealie_api/logo.png and /dev/null differ diff --git a/mealie_api/rootfs/run.txt b/mealie_api/rootfs/run.txt deleted file mode 100644 index 59f505f81..000000000 --- a/mealie_api/rootfs/run.txt +++ /dev/null @@ -1,121 +0,0 @@ -#!/usr/bin/env bashio -# shellcheck shell=bash - -set -e - -if [ ! -f /started ]; then - -touch /started - -#################### -# Starting scripts # -#################### - -for SCRIPTS in /etc/cont-init.d/*; do - [ -e "$SCRIPTS" ] || continue - echo "$SCRIPTS: executing" - chown "$(id -u)":"$(id -g)" "$SCRIPTS" - chmod a+x "$SCRIPTS" - # Change shebang if no s6 supervision - sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" - /."$SCRIPTS" || echo "$SCRIPTS: exiting $?" -done - -#################### -# Export variables # -#################### - -bashio::log.info "Exporting variables" -for k in $(bashio::jq "/data/options.json" 'keys | .[]'); do - bashio::log.blue "$k"="$(bashio::config "$k")" - export "$k"="$(bashio::config "$k")" -done - -############### -# CONFIG YAML # -############### - -CONFIGSOURCE="/config/addons_config/mealie_api/config.yaml" - -if [ -f "$CONFIGSOURCE" ]; then -bashio::log.info "config.yaml found in $CONFIGSOURCE, exporting variables" - -# Helper function -function parse_yaml { - local prefix=$2 || local prefix="" - local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @ | tr @ '\034') - sed -ne "s|^\($s\):|\1|" \ - -e "s| #.*$||g" \ - -e "s|#.*$||g" \ - -e "s|^\($s\)\($w\)$s:$s[\"']\(.*\)[\"']$s\$|\1$fs\2$fs\3|p" \ - -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p" $1 | - awk -F$fs '{ - indent = length($1)/2; - vname[indent] = $2; - for (i in vname) {if (i > indent) {delete vname[i]}} - if (length($3) > 0) { - vn=""; for (i=0; i/tmpfile -while IFS= read -r line; do - # Clean output - line="${line//[\"\']/}" - # Check if secret - if [[ "${line}" == *'!secret '* ]]; then - echo "secret detected" - secret=${line#*secret } - # Check if single match - secretnum=$(sed -n "/$secret:/=" /config/secrets.yaml) - [[ $(echo $secretnum) == *' '* ]] && bashio::exit.nok "There are multiple matches for your password name. Please check your secrets.yaml file" - # Get text - secret=$(sed -n "/$secret:/p" /config/secrets.yaml) - secret=${secret#*: } - line="${line%%=*}='$secret'" - fi - # Data validation - if [[ "$line" =~ ^.+[=].+$ ]]; then - export "$line" - # Show in log - if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi - else - bashio::exit.nok "$line does not follow the correct structure. Please check your yaml file." - fi -done <"/tmpfile" - -else -bashio::log.info "No config.yaml found in $CONFIGSOURCE, using default parameters" -fi - -############### -# PERMISSIONS # -############### - -echo "Permissions adapted" -mkdir -p /config/addons_config/mealie_data -cp -rnf /data/* /config/addons_config/mealie_data/ -chown -R "$(bashio::config "PUID"):$(bashio::config "PGID")" /config/addons_config/mealie_data -touch /config/addons_config/mealie_data/.secret -chmod -R 777 /config/addons_config/mealie_data - -####### -# SSL # -####### - -bashio::config.require.ssl -if bashio::config.true 'ssl'; then - bashio::log.info "Configuring ssl" - CERTFILE=$(bashio::config 'certfile') - KEYFILE=$(bashio::config 'keyfile') - if [ -f /app/Caddyfile ]; then sed -i "7 i tls /ssl/$CERTFILE /ssl/$KEYFILE" /app/Caddyfile; fi - if [ -f /app/frontend/Caddyfile ]; then sed -i "7 i tls /ssl/$CERTFILE /ssl/$KEYFILE" /app/frontend/Caddyfile; fi -fi - - -bashio::log.info "Starting app" - -fi diff --git a/mealie_api/updater.json b/mealie_api/updater.json deleted file mode 100644 index 103b5e5e4..000000000 --- a/mealie_api/updater.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "github_beta": "true", - "github_fulltag": "true", - "last_update": "25-12-2022", - "repository": "alexbelgium/hassio-addons", - "slug": "mealie_api", - "source": "github", - "upstream_repo": "hay-kot/mealie", - "upstream_version": "v1.0.0-beta-1" -} diff --git a/mealie_frontend/CHANGELOG.md b/mealie_frontend/CHANGELOG.md deleted file mode 100644 index b9129847e..000000000 --- a/mealie_frontend/CHANGELOG.md +++ /dev/null @@ -1,7 +0,0 @@ - -## v1.0.0-beta-1 (25-12-2022) -- Update to latest version from hay-kot/mealie - -## 1.0.0 (25-12-2022) -- Update to latest version from hay-kot/mealie -- New addon diff --git a/mealie_frontend/Dockerfile b/mealie_frontend/Dockerfile deleted file mode 100644 index c7207ab84..000000000 --- a/mealie_frontend/Dockerfile +++ /dev/null @@ -1,109 +0,0 @@ -#============================# -# ALEXBELGIUM'S DOCKERFILE # -#============================# -# _.------. -# _.-` ('>.-`"""-. -# '.--'` _'` _ .--.) -# -' '-.-';` ` -# ' - _.' ``'--. -# '---` .-'""` -# /` -#=== Home Assistant Addon ===# - -################# -# 1 Build Image # -################# - -ARG BUILD_FROM -ARG BUILD_VERSION -ARG BUILD_UPSTREAM="v1.0.0beta-5" -FROM ${BUILD_FROM}${BUILD_UPSTREAM} - -################## -# 2 Modify Image # -################## - -# Set S6 wait time -ENV S6_CMD_WAIT_FOR_SERVICES=1 \ - S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \ - S6_SERVICES_GRACETIME=0 - -# Correct data path -# hadolint ignore=DL4006 -RUN grep -rl "/app/data" /app | xargs sed -i 's|/app/data|/config/addons_config/mealie_data|g' - -################## -# 3 Install apps # -################## - -# Add rootfs -COPY rootfs/ / - -# Corrects permissions for s6 v3 -RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ - if [ -d /etc/services.d ]; then chmod -R 755 /etc/services.d; fi && \ - if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi - -# Modules -ARG MODULES="00-banner.sh 01-custom_script.sh" - -# Automatic modules download -RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && apt-get update && apt-get install -yqq --no-install-recommends ca-certificates || apk add --no-cache ca-certificates >/dev/null || true \ - && mkdir -p /etc/cont-init.d \ - && for scripts in $MODULES; do echo "$scripts" && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/$scripts" -o /etc/cont-init.d/"$scripts" && [ "$(sed -n '/\/bin/p;q' /etc/cont-init.d/"$scripts")" != "" ] || (echo "script failed to install $scripts" && exit 1); done \ - && chmod -R 755 /etc/cont-init.d - -# Manual apps -ENV PACKAGES="jq curl bash" - -# Automatic apps & bashio -# hadolint ignore=SC2015 -RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \ - && if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl) >/dev/null; fi \ - && curl -f -L -s -S "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/automatic_packages.sh" --output /automatic_packages.sh \ - && chmod 777 /automatic_packages.sh \ - && eval /./automatic_packages.sh "${PACKAGES:-}" \ - && rm /automatic_packages.sh - -################ -# 4 Entrypoint # -################ - -RUN \ - # Add custom instructions to run.sh - sed -i '1d' /app/run.sh \ - && cat /app/run.sh >> /run.txt \ - && cat /run.txt > /app/run.sh \ - && chmod +x /app/run.sh - -############ -# 5 Labels # -############ - -ARG BUILD_ARCH -ARG BUILD_DATE -ARG BUILD_DESCRIPTION -ARG BUILD_NAME -ARG BUILD_REF -ARG BUILD_REPOSITORY -ARG BUILD_VERSION -LABEL \ - io.hass.name="${BUILD_NAME}" \ - io.hass.description="${BUILD_DESCRIPTION}" \ - io.hass.arch="${BUILD_ARCH}" \ - io.hass.type="addon" \ - io.hass.version=${BUILD_VERSION} \ - maintainer="alexbelgium (https://github.com/alexbelgium)" \ - org.opencontainers.image.title="${BUILD_NAME}" \ - org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ - org.opencontainers.image.vendor="Home Assistant Add-ons" \ - org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \ - org.opencontainers.image.licenses="MIT" \ - org.opencontainers.image.url="https://github.com/alexbelgium" \ - org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ - org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ - org.opencontainers.image.created=${BUILD_DATE} \ - org.opencontainers.image.revision=${BUILD_REF} \ - org.opencontainers.image.version=${BUILD_VERSION} diff --git a/mealie_frontend/README.md b/mealie_frontend/README.md deleted file mode 100644 index 6638ce580..000000000 --- a/mealie_frontend/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Obsolete - -The dev has now published an all-in-one image! Therefore, I'm cancelling the separate api/frontend addons and moving back to the original one. It now comprises both API and frontend, and exposes both on different ports. - -As before, you can export your database, log to the new addon, then reimport it. Perhaps it could work straight out of the box as the data path stays the same diff --git a/mealie_frontend/apparmor.txt b/mealie_frontend/apparmor.txt deleted file mode 100644 index 3e27cef34..000000000 --- a/mealie_frontend/apparmor.txt +++ /dev/null @@ -1,58 +0,0 @@ -#include - -profile mealie_frontend_addon flags=(attach_disconnected,mediate_deleted) { - #include - - capability, - file, - signal, - mount, - umount, - remount, - network udp, - network tcp, - network dgram, - network stream, - network inet, - network inet6, - network netlink raw, - network unix dgram, - capability setgid, - capability setuid, - - -# S6-Overlay - /init ix, - /run/{s6,s6-rc*,service}/** ix, - /package/** ix, - /command/** ix, - /run/{,**} rwk, - /dev/tty rw, - /bin/** ix, - /usr/bin/** ix, - /usr/lib/bashio/** ix, - /etc/s6/** rix, - /run/s6/** rix, - /etc/services.d/** rwix, - /etc/cont-init.d/** rwix, - /etc/cont-finish.d/** rwix, - /init rix, - /var/run/** mrwkl, - /var/run/ mrwkl, - /dev/i2c-1 mrwkl, - /dev/sda1 mrwkl, - /dev/sdb1 mrwkl, - /dev/nvme0 mrwkl, - /dev/nvme1 mrwkl, - /dev/mmcblk0p1 mrwkl, - - # Data access - /data/** rw, - - # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container - ptrace (trace,read) peer=docker-default, - - # docker daemon confinement requires explict allow rule for signal - signal (receive) set=(kill,term) peer=/usr/bin/docker, - -} diff --git a/mealie_frontend/build.json b/mealie_frontend/build.json deleted file mode 100644 index 43aacb0bc..000000000 --- a/mealie_frontend/build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "build_from": { - "aarch64": "hkotel/mealie:frontend-", - "amd64": "hkotel/mealie:frontend-" - }, - "codenotary": { - "signer": "alexandrep.github@gmail.com" - } -} diff --git a/mealie_frontend/config.json b/mealie_frontend/config.json deleted file mode 100644 index 985382d1d..000000000 --- a/mealie_frontend/config.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "arch": [ - "aarch64", - "amd64" - ], - "codenotary": "alexandrep.github@gmail.com", - "description": "A Self Hosted Recipe Manager (frontend)", - "image": "ghcr.io/alexbelgium/mealie_frontend-{arch}", - "map": [ - "config:rw", - "share:rw", - "ssl:rw" - ], - "name": "Obsolete : Mealie (frontend)", - "options": { - "API_URL": "http://homeassistant.local:9000", - "PGID": 1000, - "PUID": 1000, - "certfile": "fullchain.pem", - "keyfile": "privkey.pem", - "ssl": false - }, - "panel_icon": "mdi:silverware-fork-knife", - "ports": { - "3000/tcp": 3012 - }, - "ports_description": { - "3000/tcp": "Webui" - }, - "schema": { - "API_URL": "str", - "BASE_URL": "str?", - "PGID": "int", - "PUID": "int", - "certfile": "str", - "keyfile": "str", - "ssl": "bool" - }, - "slug": "mealie_frontend", - "url": "https://github.com/alexbelgium/hassio-addons", - "version": "v1.0.0-beta-1b-2", - "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]" -} diff --git a/mealie_frontend/icon.png b/mealie_frontend/icon.png deleted file mode 100644 index 136b39515..000000000 Binary files a/mealie_frontend/icon.png and /dev/null differ diff --git a/mealie_frontend/logo.png b/mealie_frontend/logo.png deleted file mode 100644 index cf2a90906..000000000 Binary files a/mealie_frontend/logo.png and /dev/null differ diff --git a/mealie_frontend/rootfs/run.txt b/mealie_frontend/rootfs/run.txt deleted file mode 100644 index 4adcc92d5..000000000 --- a/mealie_frontend/rootfs/run.txt +++ /dev/null @@ -1,121 +0,0 @@ -#!/usr/bin/env bashio -# shellcheck shell=bash - -set -e - -if [ ! -f /started ]; then - -touch /started - -#################### -# Starting scripts # -#################### - -for SCRIPTS in /etc/cont-init.d/*; do - [ -e "$SCRIPTS" ] || continue - echo "$SCRIPTS: executing" - chown "$(id -u)":"$(id -g)" "$SCRIPTS" - chmod a+x "$SCRIPTS" - # Change shebang if no s6 supervision - sed -i 's|/usr/bin/with-contenv bashio|/usr/bin/env bashio|g' "$SCRIPTS" - /."$SCRIPTS" || echo "$SCRIPTS: exiting $?" -done - -#################### -# Export variables # -#################### - -bashio::log.info "Exporting variables" -for k in $(bashio::jq "/data/options.json" 'keys | .[]'); do - bashio::log.blue "$k"="$(bashio::config "$k")" - export "$k"="$(bashio::config "$k")" -done - -############### -# CONFIG YAML # -############### - -CONFIGSOURCE="/config/addons_config/mealie_frontend/config.yaml" - -if [ -f "$CONFIGSOURCE" ]; then -bashio::log.info "config.yaml found in $CONFIGSOURCE, exporting variables" - -# Helper function -function parse_yaml { - local prefix=$2 || local prefix="" - local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @ | tr @ '\034') - sed -ne "s|^\($s\):|\1|" \ - -e "s| #.*$||g" \ - -e "s|#.*$||g" \ - -e "s|^\($s\)\($w\)$s:$s[\"']\(.*\)[\"']$s\$|\1$fs\2$fs\3|p" \ - -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p" $1 | - awk -F$fs '{ - indent = length($1)/2; - vname[indent] = $2; - for (i in vname) {if (i > indent) {delete vname[i]}} - if (length($3) > 0) { - vn=""; for (i=0; i/tmpfile -while IFS= read -r line; do - # Clean output - line="${line//[\"\']/}" - # Check if secret - if [[ "${line}" == *'!secret '* ]]; then - echo "secret detected" - secret=${line#*secret } - # Check if single match - secretnum=$(sed -n "/$secret:/=" /config/secrets.yaml) - [[ $(echo $secretnum) == *' '* ]] && bashio::exit.nok "There are multiple matches for your password name. Please check your secrets.yaml file" - # Get text - secret=$(sed -n "/$secret:/p" /config/secrets.yaml) - secret=${secret#*: } - line="${line%%=*}='$secret'" - fi - # Data validation - if [[ "$line" =~ ^.+[=].+$ ]]; then - export "$line" - # Show in log - if ! bashio::config.false "verbose"; then bashio::log.blue "$line"; fi - else - bashio::exit.nok "$line does not follow the correct structure. Please check your yaml file." - fi -done <"/tmpfile" - -else -bashio::log.info "No config.yaml found in $CONFIGSOURCE, using default parameters" -fi - -############### -# PERMISSIONS # -############### - -echo "Permissions adapted" -mkdir -p /config/addons_config/mealie_data -cp -rnf /data/* /config/addons_config/mealie_data/ -rm /config/addons_config/mealie_data/options.json || true -chmod 777 /config/addons_config/mealie_data -chown -R "$(bashio::config "PUID"):$(bashio::config "PGID")" /config/addons_config/mealie_data - -####### -# SSL # -####### - -bashio::config.require.ssl -if bashio::config.true 'ssl'; then - bashio::log.info "Configuring ssl" - CERTFILE=$(bashio::config 'certfile') - KEYFILE=$(bashio::config 'keyfile') - if [ -f /app/Caddyfile ]; then sed -i "7 i tls /ssl/$CERTFILE /ssl/$KEYFILE" /app/Caddyfile; fi - if [ -f /app/frontend/Caddyfile ]; then sed -i "7 i tls /ssl/$CERTFILE /ssl/$KEYFILE" /app/frontend/Caddyfile; fi -fi - - -bashio::log.info "Starting app" - -fi diff --git a/mealie_frontend/updater.json b/mealie_frontend/updater.json deleted file mode 100644 index 25e5d496d..000000000 --- a/mealie_frontend/updater.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "github_beta": "true", - "github_fulltag": "true", - "last_update": "25-12-2022", - "repository": "alexbelgium/hassio-addons", - "slug": "mealie_frontend", - "source": "github", - "upstream_repo": "hay-kot/mealie", - "upstream_version": "v1.0.0-beta-1" -}