From 67b1f8bc69aa2f55d6a6e9c558bfbdaf7bf46bab Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 9 Jun 2022 23:01:10 +0200 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on=20base?= =?UTF-8?q?=20image=20to=2012.0.0=20(#240)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tasmoadmin/Dockerfile | 19 +++++++++---------- tasmoadmin/build.yaml | 10 +++++----- tasmoadmin/rootfs/etc/cont-init.d/nginx.sh | 2 +- .../rootfs/etc/cont-init.d/tasmoadmin.sh | 2 +- .../rootfs/etc/fix-attrs.d/01-tasmoadmin | 2 -- .../rootfs/etc/{php7 => php8}/blacklist.txt | 0 .../{php7 => php8}/conf.d/99-tasmoadmin.ini | 0 .../etc/{php7 => php8}/php-fpm.d/www.conf | 4 ++-- tasmoadmin/rootfs/etc/services.d/nginx/finish | 12 +++++++----- tasmoadmin/rootfs/etc/services.d/nginx/run | 4 ++-- .../rootfs/etc/services.d/php-fpm/finish | 10 ++++++---- tasmoadmin/rootfs/etc/services.d/php-fpm/run | 4 ++-- 12 files changed, 35 insertions(+), 34 deletions(-) mode change 100644 => 100755 tasmoadmin/rootfs/etc/cont-init.d/tasmoadmin.sh delete mode 100644 tasmoadmin/rootfs/etc/fix-attrs.d/01-tasmoadmin rename tasmoadmin/rootfs/etc/{php7 => php8}/blacklist.txt (100%) rename tasmoadmin/rootfs/etc/{php7 => php8}/conf.d/99-tasmoadmin.ini (100%) rename tasmoadmin/rootfs/etc/{php7 => php8}/php-fpm.d/www.conf (86%) mode change 100644 => 100755 tasmoadmin/rootfs/etc/services.d/php-fpm/finish mode change 100644 => 100755 tasmoadmin/rootfs/etc/services.d/php-fpm/run diff --git a/tasmoadmin/Dockerfile b/tasmoadmin/Dockerfile index befdd63..485c102 100755 --- a/tasmoadmin/Dockerfile +++ b/tasmoadmin/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:11.1.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:12.0.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} @@ -8,17 +8,16 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Setup base RUN \ apk add --no-cache \ - nginx=1.20.2-r0 \ - php7-curl=7.4.28-r0 \ - php7-fpm=7.4.28-r0 \ - php7-json=7.4.28-r0 \ - php7-opcache=7.4.28-r0 \ - php7-session=7.4.28-r0 \ - php7-zip=7.4.28-r0 \ - php7=7.4.28-r0 \ + nginx=1.22.0-r0 \ + php8-curl=8.0.19-r1 \ + php8-fpm=8.0.19-r1 \ + php8-opcache=8.0.19-r1 \ + php8-session=8.0.19-r1 \ + php8-zip=8.0.19-r1 \ + php8=8.0.19-r1 \ \ && apk add --no-cache --virtual .build-dependencies \ - git=2.34.1-r0 \ + git=2.36.1-r0 \ \ && git clone --branch v1.8.0 --depth=1 \ https://github.com/reloxx13/TasmoAdmin.git /var/www/tasmoadmin \ diff --git a/tasmoadmin/build.yaml b/tasmoadmin/build.yaml index cb7c940..9f7b211 100644 --- a/tasmoadmin/build.yaml +++ b/tasmoadmin/build.yaml @@ -1,10 +1,10 @@ --- build_from: - aarch64: ghcr.io/hassio-addons/base/aarch64:11.1.0 - amd64: ghcr.io/hassio-addons/base/amd64:11.1.0 - armhf: ghcr.io/hassio-addons/base/armhf:11.1.0 - armv7: ghcr.io/hassio-addons/base/armv7:11.1.0 - i386: ghcr.io/hassio-addons/base/i386:11.1.0 + aarch64: ghcr.io/hassio-addons/base/aarch64:12.0.0 + amd64: ghcr.io/hassio-addons/base/amd64:12.0.0 + armhf: ghcr.io/hassio-addons/base/armhf:12.0.0 + armv7: ghcr.io/hassio-addons/base/armv7:12.0.0 + i386: ghcr.io/hassio-addons/base/i386:12.0.0 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev diff --git a/tasmoadmin/rootfs/etc/cont-init.d/nginx.sh b/tasmoadmin/rootfs/etc/cont-init.d/nginx.sh index d93ea30..6edc9b7 100755 --- a/tasmoadmin/rootfs/etc/cont-init.d/nginx.sh +++ b/tasmoadmin/rootfs/etc/cont-init.d/nginx.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/command/with-contenv bashio # ============================================================================== # Home Assistant Community Add-on: TasmoAdmin # Configures NGINX for use with TasmoAdmin diff --git a/tasmoadmin/rootfs/etc/cont-init.d/tasmoadmin.sh b/tasmoadmin/rootfs/etc/cont-init.d/tasmoadmin.sh old mode 100644 new mode 100755 index d8d8c17..27822d4 --- a/tasmoadmin/rootfs/etc/cont-init.d/tasmoadmin.sh +++ b/tasmoadmin/rootfs/etc/cont-init.d/tasmoadmin.sh @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/command/with-contenv bashio # ============================================================================== # Home Assistant Community Add-on: TasmoAdmin # Configures TasmoAdmin diff --git a/tasmoadmin/rootfs/etc/fix-attrs.d/01-tasmoadmin b/tasmoadmin/rootfs/etc/fix-attrs.d/01-tasmoadmin deleted file mode 100644 index b4c1660..0000000 --- a/tasmoadmin/rootfs/etc/fix-attrs.d/01-tasmoadmin +++ /dev/null @@ -1,2 +0,0 @@ -/var/www/tasmoadmin true nginx 0644 0755 -/data/tasmoadmin true nginx 0644 0755 diff --git a/tasmoadmin/rootfs/etc/php7/blacklist.txt b/tasmoadmin/rootfs/etc/php8/blacklist.txt similarity index 100% rename from tasmoadmin/rootfs/etc/php7/blacklist.txt rename to tasmoadmin/rootfs/etc/php8/blacklist.txt diff --git a/tasmoadmin/rootfs/etc/php7/conf.d/99-tasmoadmin.ini b/tasmoadmin/rootfs/etc/php8/conf.d/99-tasmoadmin.ini similarity index 100% rename from tasmoadmin/rootfs/etc/php7/conf.d/99-tasmoadmin.ini rename to tasmoadmin/rootfs/etc/php8/conf.d/99-tasmoadmin.ini diff --git a/tasmoadmin/rootfs/etc/php7/php-fpm.d/www.conf b/tasmoadmin/rootfs/etc/php8/php-fpm.d/www.conf similarity index 86% rename from tasmoadmin/rootfs/etc/php7/php-fpm.d/www.conf rename to tasmoadmin/rootfs/etc/php8/php-fpm.d/www.conf index 13c8a71..6134153 100644 --- a/tasmoadmin/rootfs/etc/php7/php-fpm.d/www.conf +++ b/tasmoadmin/rootfs/etc/php8/php-fpm.d/www.conf @@ -1,6 +1,6 @@ [www] -user = nginx -group = nginx +user = root +group = root listen = 127.0.0.1:9001 pm = dynamic pm.max_children = 10 diff --git a/tasmoadmin/rootfs/etc/services.d/nginx/finish b/tasmoadmin/rootfs/etc/services.d/nginx/finish index fd57507..15fe15c 100755 --- a/tasmoadmin/rootfs/etc/services.d/nginx/finish +++ b/tasmoadmin/rootfs/etc/services.d/nginx/finish @@ -1,9 +1,11 @@ -#!/usr/bin/execlineb -S0 +#!/command/with-contenv bashio # ============================================================================== # Home Assistant Community Add-on: TasmoAdmin -# Take down the S6 supervision tree when Nginx fails +# Take down the S6 supervision tree when NGINX fails # ============================================================================== -if -n { s6-test $# -ne 0 } -if -n { s6-test ${1} -eq 256 } +if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then + bashio::log.warning "NGINX crashed, halting add-on" + /run/s6/basedir/bin/halt +fi -s6-svscanctl -t /var/run/s6/services +bashio::log.info "NGINX stopped, restarting..." diff --git a/tasmoadmin/rootfs/etc/services.d/nginx/run b/tasmoadmin/rootfs/etc/services.d/nginx/run index 973d3a4..b79369c 100755 --- a/tasmoadmin/rootfs/etc/services.d/nginx/run +++ b/tasmoadmin/rootfs/etc/services.d/nginx/run @@ -1,9 +1,9 @@ -#!/usr/bin/with-contenv bashio +#!/command/with-contenv bashio # ============================================================================== # Home Assistant Community Add-on: TasmoAdmin # Runs the Nginx daemon # ============================================================================== # Wait for PHP-FPM to become available bashio::net.wait_for 9001 -bashio::log.info "Starting NGinx server..." +bashio::log.info "Starting NGINX server..." exec nginx -g "daemon off;" diff --git a/tasmoadmin/rootfs/etc/services.d/php-fpm/finish b/tasmoadmin/rootfs/etc/services.d/php-fpm/finish old mode 100644 new mode 100755 index c6c7602..336c659 --- a/tasmoadmin/rootfs/etc/services.d/php-fpm/finish +++ b/tasmoadmin/rootfs/etc/services.d/php-fpm/finish @@ -1,9 +1,11 @@ -#!/usr/bin/execlineb -S0 +#!/command/with-contenv bashio # ============================================================================== # Home Assistant Community Add-on: TasmoAdmin # Take down the S6 supervision tree when PHP FPM fails # ============================================================================== -if -n { s6-test $# -ne 0 } -if -n { s6-test ${1} -eq 256 } +if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then + bashio::log.warning "PHP-FPM crashed, halting add-on" + /run/s6/basedir/bin/halt +fi -s6-svscanctl -t /var/run/s6/services +bashio::log.info "PHP-FPM stopped, restarting..." diff --git a/tasmoadmin/rootfs/etc/services.d/php-fpm/run b/tasmoadmin/rootfs/etc/services.d/php-fpm/run old mode 100644 new mode 100755 index 612f33e..6dd71ad --- a/tasmoadmin/rootfs/etc/services.d/php-fpm/run +++ b/tasmoadmin/rootfs/etc/services.d/php-fpm/run @@ -1,7 +1,7 @@ -#!/usr/bin/with-contenv bashio +#!/command/with-contenv bashio # ============================================================================== # Home Assistant Community Add-on: TasmoAdmin # Runs the PHP-FPM daemon # ============================================================================== bashio::log.info "Starting PHP-FPM server..." -exec php-fpm7 --nodaemonize +exec php-fpm8 -R --nodaemonize