From 6d735ad0849d6268c2d5026cde6bf2f5e0c726d4 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Wed, 8 Mar 2023 13:44:07 +0100 Subject: [PATCH] Rollback code to 2.17.1-2 https://github.com/alexbelgium/hassio-addons/issues/745 --- portainer/Dockerfile | 11 +++----- portainer/README.md | 1 + portainer/build.json | 6 ++--- portainer/config.json | 2 +- .../cont-init.d/00-aaa_portainer_install.sh | 23 ++++++++++++++++ .../run => cont-init.d/30-nginx.sh} | 4 +-- portainer/rootfs/etc/cont-init.d/portainer.sh | 7 +++++ .../etc/s6-overlay/s6-rc.d/init-nginx/type | 1 - .../etc/s6-overlay/s6-rc.d/init-nginx/up | 1 - .../s6-rc.d/nginx/dependencies.d/init-nginx | 1 - .../s6-rc.d/nginx/dependencies.d/portainer | 1 - .../etc/s6-overlay/s6-rc.d/nginx/finish | 26 ------------------ .../rootfs/etc/s6-overlay/s6-rc.d/nginx/run | 11 -------- .../rootfs/etc/s6-overlay/s6-rc.d/nginx/type | 1 - .../etc/s6-overlay/s6-rc.d/portainer/finish | 27 ------------------- .../etc/s6-overlay/s6-rc.d/portainer/type | 1 - .../s6-rc.d/user/contents.d/init-nginx | 1 - .../s6-overlay/s6-rc.d/user/contents.d/nginx | 1 - .../s6-rc.d/user/contents.d/portainer | 1 - portainer/rootfs/etc/services.d/nginx/finish | 9 +++++++ portainer/rootfs/etc/services.d/nginx/run | 12 +++++++++ .../rootfs/etc/services.d/portainer/finish | 9 +++++++ .../s6-rc.d => services.d}/portainer/run | 2 +- portainer/translations/en.yaml | 2 +- 24 files changed, 71 insertions(+), 90 deletions(-) create mode 100644 portainer/rootfs/etc/cont-init.d/00-aaa_portainer_install.sh rename portainer/rootfs/etc/{s6-overlay/s6-rc.d/init-nginx/run => cont-init.d/30-nginx.sh} (94%) mode change 100755 => 100644 create mode 100644 portainer/rootfs/etc/cont-init.d/portainer.sh delete mode 100644 portainer/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type delete mode 100644 portainer/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up delete mode 100644 portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx delete mode 100644 portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/portainer delete mode 100644 portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/finish delete mode 100644 portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/run delete mode 100644 portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/type delete mode 100644 portainer/rootfs/etc/s6-overlay/s6-rc.d/portainer/finish delete mode 100644 portainer/rootfs/etc/s6-overlay/s6-rc.d/portainer/type delete mode 100644 portainer/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx delete mode 100644 portainer/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx delete mode 100644 portainer/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/portainer create mode 100644 portainer/rootfs/etc/services.d/nginx/finish create mode 100644 portainer/rootfs/etc/services.d/nginx/run create mode 100644 portainer/rootfs/etc/services.d/portainer/finish rename portainer/rootfs/etc/{s6-overlay/s6-rc.d => services.d}/portainer/run (98%) diff --git a/portainer/Dockerfile b/portainer/Dockerfile index bcf48999c..f07f8f781 100644 --- a/portainer/Dockerfile +++ b/portainer/Dockerfile @@ -63,7 +63,7 @@ RUN if [ -d /etc/cont-init.d ]; then chmod -R 755 /etc/cont-init.d; fi && \ if [ -f /entrypoint.sh ]; then chmod 755 /entrypoint.sh; fi # Modules -ARG MODULES="01-custom_script.sh" +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 \ @@ -89,20 +89,15 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get # 4 Entrypoint # ################ +RUN chmod 777 /etc/services.d/*/* #RUN chmod 777 /entrypoint.sh #WORKDIR / #ENTRYPOINT [ "/usr/bin/env" ] #CMD [ "/entrypoint.sh" ] #SHELL ["/bin/bash", "-o", "pipefail", "-c"] -################# -# 5 Healthcheck # -################# - -HEALTHCHECK CMD curl --fail http://127.0.0.1:9000 || exit 1 - ############ -# 6 Labels # +# 5 Labels # ############ ARG BUILD_ARCH diff --git a/portainer/README.md b/portainer/README.md index 94d295901..6e39a3b58 100644 --- a/portainer/README.md +++ b/portainer/README.md @@ -1,4 +1,5 @@ ## ⚠ Open Request : [✨ [REQUEST] Portainer Agent (opened 2022-11-19)](https://github.com/alexbelgium/hassio-addons/issues/565) by [@rikardronnkvist](https://github.com/rikardronnkvist) +## ⚠ Open Issue : [Installed Portainer Add-on but it does not start (opened 2023-02-27)](https://github.com/alexbelgium/hassio-addons/issues/736) by [@deltabert](https://github.com/deltabert) # Home assistant add-on: Portainer [![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium) diff --git a/portainer/build.json b/portainer/build.json index dcb4b6a11..8c917867d 100644 --- a/portainer/build.json +++ b/portainer/build.json @@ -1,8 +1,8 @@ { "build_from": { - "aarch64": "ghcr.io/hassio-addons/base:13.1.2", - "amd64": "ghcr.io/hassio-addons/base:13.1.2", - "armv7": "ghcr.io/hassio-addons/base:13.1.2" + "aarch64": "ghcr.io/hassio-addons/base/aarch64:stable", + "amd64": "ghcr.io/hassio-addons/base/amd64:stable", + "armv7": "ghcr.io/hassio-addons/base/armv7:stable" }, "codenotary": { "signer": "alexandrep.github@gmail.com" diff --git a/portainer/config.json b/portainer/config.json index 99350065a..fb6eb755e 100644 --- a/portainer/config.json +++ b/portainer/config.json @@ -45,5 +45,5 @@ }, "slug": "portainer", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "2.17.1-4" + "version": "2.17.1-2" } diff --git a/portainer/rootfs/etc/cont-init.d/00-aaa_portainer_install.sh b/portainer/rootfs/etc/cont-init.d/00-aaa_portainer_install.sh new file mode 100644 index 000000000..3eb804c9e --- /dev/null +++ b/portainer/rootfs/etc/cont-init.d/00-aaa_portainer_install.sh @@ -0,0 +1,23 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash +if [ -e "/PORTFILE" ]; then + echo "Installing portainer..." + BUILD_UPSTREAM=$(/dev/null + echo "... success!" +fi diff --git a/portainer/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run b/portainer/rootfs/etc/cont-init.d/30-nginx.sh old mode 100755 new mode 100644 similarity index 94% rename from portainer/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run rename to portainer/rootfs/etc/cont-init.d/30-nginx.sh index be969849a..400a6ad54 --- a/portainer/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run +++ b/portainer/rootfs/etc/cont-init.d/30-nginx.sh @@ -1,4 +1,4 @@ -#!/command/with-contenv bashio +#!/usr/bin/with-contenv bashio # shellcheck shell=bash ################# @@ -30,5 +30,3 @@ bashio::var.json \ tempio \ -template /etc/nginx/templates/ingress.gtpl \ -out /etc/nginx/servers/ingress.conf - -bashio::require.unprotected diff --git a/portainer/rootfs/etc/cont-init.d/portainer.sh b/portainer/rootfs/etc/cont-init.d/portainer.sh new file mode 100644 index 000000000..7bda5454e --- /dev/null +++ b/portainer/rootfs/etc/cont-init.d/portainer.sh @@ -0,0 +1,7 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash +# ============================================================================== +# Home Assistant Community Add-on: Portainer +# Runs some initializations for Portainer +# ============================================================================== +bashio::require.unprotected diff --git a/portainer/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type b/portainer/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type deleted file mode 100644 index bdd22a185..000000000 --- a/portainer/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type +++ /dev/null @@ -1 +0,0 @@ -oneshot diff --git a/portainer/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up b/portainer/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up deleted file mode 100644 index b3b5b494b..000000000 --- a/portainer/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-nginx/run diff --git a/portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx b/portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx deleted file mode 100644 index 8b1378917..000000000 --- a/portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx +++ /dev/null @@ -1 +0,0 @@ - diff --git a/portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/portainer b/portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/portainer deleted file mode 100644 index 8b1378917..000000000 --- a/portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/portainer +++ /dev/null @@ -1 +0,0 @@ - diff --git a/portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/finish b/portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/finish deleted file mode 100644 index 70012da14..000000000 --- a/portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/finish +++ /dev/null @@ -1,26 +0,0 @@ -#!/command/with-contenv bashio -# ============================================================================== -# Home Assistant Community Add-on: AdGuard Home -# Take down the S6 supervision tree when Nginx fails -# ============================================================================== -declare exit_code -readonly exit_code_container=$( /run/s6-linux-init-container-results/exitcode - fi - [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt -elif [[ "${exit_code_service}" -ne 0 ]]; then - if [[ "${exit_code_container}" -eq 0 ]]; then - echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode - fi - exec /run/s6/basedir/bin/halt -fi diff --git a/portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/run b/portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/run deleted file mode 100644 index e5bc5bbab..000000000 --- a/portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/run +++ /dev/null @@ -1,11 +0,0 @@ -#!/command/with-contenv bashio -# ============================================================================== -# Home Assistant Community Add-on: AdGuard Home -# Runs the Nginx daemon -# ============================================================================== - -# Wait for adguard to become available -bashio::net.wait_for 9000 localhost 900 - -bashio::log.info "Starting NGinx..." -exec nginx diff --git a/portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/type b/portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/type deleted file mode 100644 index 5883cff0c..000000000 --- a/portainer/rootfs/etc/s6-overlay/s6-rc.d/nginx/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/portainer/rootfs/etc/s6-overlay/s6-rc.d/portainer/finish b/portainer/rootfs/etc/s6-overlay/s6-rc.d/portainer/finish deleted file mode 100644 index 222cdac18..000000000 --- a/portainer/rootfs/etc/s6-overlay/s6-rc.d/portainer/finish +++ /dev/null @@ -1,27 +0,0 @@ -#!/command/with-contenv bashio -# shellcheck shell=bash -# ============================================================================== -# Home Assistant Community Add-on: AdGuard Home -# Take down the S6 supervision tree when Adguard Home fails -# ============================================================================== -declare exit_code -readonly exit_code_container=$( /run/s6-linux-init-container-results/exitcode - fi - [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt -elif [[ "${exit_code_service}" -ne 0 ]]; then - if [[ "${exit_code_container}" -eq 0 ]]; then - echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode - fi - exec /run/s6/basedir/bin/halt -fi diff --git a/portainer/rootfs/etc/s6-overlay/s6-rc.d/portainer/type b/portainer/rootfs/etc/s6-overlay/s6-rc.d/portainer/type deleted file mode 100644 index 5883cff0c..000000000 --- a/portainer/rootfs/etc/s6-overlay/s6-rc.d/portainer/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/portainer/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx b/portainer/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx deleted file mode 100644 index 8b1378917..000000000 --- a/portainer/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx +++ /dev/null @@ -1 +0,0 @@ - diff --git a/portainer/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx b/portainer/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx deleted file mode 100644 index 8b1378917..000000000 --- a/portainer/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx +++ /dev/null @@ -1 +0,0 @@ - diff --git a/portainer/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/portainer b/portainer/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/portainer deleted file mode 100644 index 8b1378917..000000000 --- a/portainer/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/portainer +++ /dev/null @@ -1 +0,0 @@ - diff --git a/portainer/rootfs/etc/services.d/nginx/finish b/portainer/rootfs/etc/services.d/nginx/finish new file mode 100644 index 000000000..5704b02f5 --- /dev/null +++ b/portainer/rootfs/etc/services.d/nginx/finish @@ -0,0 +1,9 @@ + +#!/usr/bin/execlineb -S0 +# ============================================================================== +# Take down the S6 supervision tree when Nginx fails +# ============================================================================== +if { s6-test ${1} -ne 0 } +if { s6-test ${1} -ne 256 } + +s6-svscanctl -t /var/run/s6/services diff --git a/portainer/rootfs/etc/services.d/nginx/run b/portainer/rootfs/etc/services.d/nginx/run new file mode 100644 index 000000000..f488f6890 --- /dev/null +++ b/portainer/rootfs/etc/services.d/nginx/run @@ -0,0 +1,12 @@ +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash +# ============================================================================== + +bashio::log.info "Waiting for port 9000 to open..." + +# Wait for transmission to become available +bashio::net.wait_for 9000 localhost 900 + +bashio::log.info "Starting NGinx..." + +exec nginx diff --git a/portainer/rootfs/etc/services.d/portainer/finish b/portainer/rootfs/etc/services.d/portainer/finish new file mode 100644 index 000000000..1d3dca7f6 --- /dev/null +++ b/portainer/rootfs/etc/services.d/portainer/finish @@ -0,0 +1,9 @@ +#!/usr/bin/execlineb -S0 +# ============================================================================== +# Home Assistant Community Add-on: Portainer +# Take down the S6 supervision tree when Portainer fails +# ============================================================================== +if { s6-test ${1} -ne 0 } +if { s6-test ${1} -ne 256 } + +s6-svscanctl -t /var/run/s6/services diff --git a/portainer/rootfs/etc/s6-overlay/s6-rc.d/portainer/run b/portainer/rootfs/etc/services.d/portainer/run similarity index 98% rename from portainer/rootfs/etc/s6-overlay/s6-rc.d/portainer/run rename to portainer/rootfs/etc/services.d/portainer/run index 0c42aeb09..420f6fdc6 100644 --- a/portainer/rootfs/etc/s6-overlay/s6-rc.d/portainer/run +++ b/portainer/rootfs/etc/services.d/portainer/run @@ -1,4 +1,4 @@ -#!/command/with-contenv bashio +#!/usr/bin/env bashio # shellcheck shell=bash bashio::log.info "Starting Portainer..." diff --git a/portainer/translations/en.yaml b/portainer/translations/en.yaml index 18cd11c17..e5b8cd982 100644 --- a/portainer/translations/en.yaml +++ b/portainer/translations/en.yaml @@ -503,7 +503,7 @@ configuration: description: See upstream app documentation whitelist: name: whitelist - description: '"localhost,192.168.0.0/16" # list ip subnets that that can access the webui' + description: '"localhost,192.168.0.0/16" # list ip subnets that do no need a password' WHOOGLE_ALT_IG: name: WHOOGLE_ALT_IG description: See upstream app documentation