From 87e7c6c0b85877e42a04056947a523ccad94855e Mon Sep 17 00:00:00 2001 From: Franck Nijhof Date: Thu, 9 Jun 2022 21:22:06 +0200 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on=20base?= =?UTF-8?q?=20image=20to=206.0.0=20(#45)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- foldingathome/Dockerfile | 2 +- foldingathome/build.yaml | 2 +- foldingathome/rootfs/etc/services.d/fah/finish | 10 ++++++---- foldingathome/rootfs/etc/services.d/fah/run | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) mode change 100644 => 100755 foldingathome/rootfs/etc/services.d/fah/finish mode change 100644 => 100755 foldingathome/rootfs/etc/services.d/fah/run diff --git a/foldingathome/Dockerfile b/foldingathome/Dockerfile index 9a069b8..401cd5c 100755 --- a/foldingathome/Dockerfile +++ b/foldingathome/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:5.3.0 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:6.0.0 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/foldingathome/build.yaml b/foldingathome/build.yaml index e40c932..9831ca1 100644 --- a/foldingathome/build.yaml +++ b/foldingathome/build.yaml @@ -1,6 +1,6 @@ --- build_from: - amd64: ghcr.io/hassio-addons/debian-base/amd64:5.3.0 + amd64: ghcr.io/hassio-addons/debian-base/amd64:6.0.0 codenotary: base_image: codenotary@frenck.dev signer: codenotary@frenck.dev diff --git a/foldingathome/rootfs/etc/services.d/fah/finish b/foldingathome/rootfs/etc/services.d/fah/finish old mode 100644 new mode 100755 index f9824df..0b1468e --- a/foldingathome/rootfs/etc/services.d/fah/finish +++ b/foldingathome/rootfs/etc/services.d/fah/finish @@ -1,9 +1,11 @@ -#!/usr/bin/execlineb -S0 +#!/command/with-contenv bashio # ============================================================================== # Home Assistant Community Add-on: Folding@home # Take down the S6 supervision tree when FAHClient fails # ============================================================================== -if { s6-test ${1} -ne 0 } -if { s6-test ${1} -ne 256 } +if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then + bashio::log.warning "FAHClient crashed, halting add-on" + /run/s6/basedir/bin/halt +fi -s6-svscanctl -t /var/run/s6/services +bashio::log.info "FAHClient stopped, restarting..." diff --git a/foldingathome/rootfs/etc/services.d/fah/run b/foldingathome/rootfs/etc/services.d/fah/run old mode 100644 new mode 100755 index 9e9a97a..1a7f598 --- a/foldingathome/rootfs/etc/services.d/fah/run +++ b/foldingathome/rootfs/etc/services.d/fah/run @@ -1,4 +1,4 @@ -#!/usr/bin/with-contenv bashio +#!/command/with-contenv bashio # shellcheck disable=SC2191 # ============================================================================== # Home Assistant Community Add-on: Folding@home