Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update addon base 12.2.3 #166

Merged
merged 2 commits into from
Aug 30, 2022
Merged

Update addon base 12.2.3 #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4943524
Update addon base 12.2.3
mdegat01 Aug 30, 2022
e53988d
Bump ca-certificates and nginx
mdegat01 Aug 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions loki/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ RUN set -eux; \
apk del .build-deps; \
\
apk add --no-cache \
ca-certificates=20211220-r0 \
nginx=1.20.2-r1 \
ca-certificates=20220614-r0 \
nginx=1.22.0-r1 \
; \
update-ca-certificates; \
nginx -v; \
Expand Down
8 changes: 4 additions & 4 deletions loki/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
build_from:
amd64: ghcr.io/hassio-addons/base/amd64:11.1.2
armhf: ghcr.io/hassio-addons/base/armhf:11.1.2
armv7: ghcr.io/hassio-addons/base/armv7:11.1.2
aarch64: ghcr.io/hassio-addons/base/aarch64:11.1.2
amd64: ghcr.io/hassio-addons/base/amd64:12.2.3
armhf: ghcr.io/hassio-addons/base/armhf:12.2.3
armv7: ghcr.io/hassio-addons/base/armv7:12.2.3
aarch64: ghcr.io/hassio-addons/base/aarch64:12.2.3
codenotary:
base_image: codenotary@frenck.dev
signer: codenotary@degatano.com
13 changes: 9 additions & 4 deletions loki/rootfs/etc/services.d/loki/finish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
#!/usr/bin/execlineb -S0
#!/usr/bin/env bashio
# ==============================================================================
# Home Assistant Add-on: Loki
# Take down the S6 supervision tree when Loki fails
# ==============================================================================
if { s6-test ${1} -ne 0 }
if { s6-test ${1} -ne 256 }

s6-svscanctl -t /var/run/s6/services
declare APP_EXIT_CODE=${1}

if [[ "${APP_EXIT_CODE}" -ne 0 ]] && [[ "${APP_EXIT_CODE}" -ne 256 ]]; then
bashio::log.warning "Halt add-on with exit code ${APP_EXIT_CODE}"
echo "${APP_EXIT_CODE}" > /run/s6-linux-init-container-results/exitcode
exec /run/s6/basedir/bin/halt
fi

12 changes: 8 additions & 4 deletions loki/rootfs/etc/services.d/nginx/finish
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
#!/usr/bin/execlineb -S0
#!/usr/bin/env bashio
# ==============================================================================
# Home Assistant Add-on: Loki
# 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
declare APP_EXIT_CODE=${1}

if [[ "${APP_EXIT_CODE}" -ne 0 ]] && [[ "${APP_EXIT_CODE}" -ne 256 ]]; then
bashio::log.warning "Halt add-on with exit code ${APP_EXIT_CODE}"
echo "${APP_EXIT_CODE}" > /run/s6-linux-init-container-results/exitcode
exec /run/s6/basedir/bin/halt
fi