⬆️ Upgrades add-on base image to 12.0.0 (#113)

* ⬆️ Upgrades add-on base image to 12.0.0

* Update debs
This commit is contained in:
Franck Nijhof 2022-06-09 10:22:47 +02:00 committed by GitHub
parent 47c6b17731
commit 5c09fe1ab3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 30 additions and 24 deletions

View file

@ -1,4 +1,4 @@
ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:11.1.2 ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:12.0.0
# hadolint ignore=DL3006 # hadolint ignore=DL3006
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
@ -6,15 +6,16 @@ FROM ${BUILD_FROM}
# hadolint ignore=DL3003 # hadolint ignore=DL3003
RUN \ RUN \
apk add --no-cache --virtual .build-dependencies \ apk add --no-cache --virtual .build-dependencies \
g++=10.3.1_git20211027-r0 \ g++=11.2.1_git20220219-r2 \
git=2.34.2-r0 \ git=2.36.1-r0 \
make=4.3-r0 \ make=4.3-r0 \
python2=2.7.18-r4 \ python3=3.10.4-r0 \
yarn=1.22.17-r0 \ yarn=1.22.19-r0 \
\ \
&& apk add --no-cache \ && apk add --no-cache \
nginx=1.20.2-r1 \ icu-data-full=71.1-r2 \
nodejs=16.14.2-r0 \ nginx=1.22.0-r0 \
nodejs=16.15.0-r1 \
\ \
&& yarn global add \ && yarn global add \
modclean@3.0.0-beta.1 \ modclean@3.0.0-beta.1 \

View file

@ -1,10 +1,10 @@
--- ---
build_from: build_from:
aarch64: ghcr.io/hassio-addons/base/aarch64:11.1.2 aarch64: ghcr.io/hassio-addons/base/aarch64:12.0.0
amd64: ghcr.io/hassio-addons/base/amd64:11.1.2 amd64: ghcr.io/hassio-addons/base/amd64:12.0.0
armhf: ghcr.io/hassio-addons/base/armhf:11.1.2 armhf: ghcr.io/hassio-addons/base/armhf:12.0.0
armv7: ghcr.io/hassio-addons/base/armv7:11.1.2 armv7: ghcr.io/hassio-addons/base/armv7:12.0.0
i386: ghcr.io/hassio-addons/base/i386:11.1.2 i386: ghcr.io/hassio-addons/base/i386:12.0.0
codenotary: codenotary:
base_image: codenotary@frenck.dev base_image: codenotary@frenck.dev
signer: codenotary@frenck.dev signer: codenotary@frenck.dev

View file

@ -13,6 +13,7 @@ arch:
- i386 - i386
ingress: true ingress: true
ingress_stream: true ingress_stream: true
init: false
panel_icon: mdi:chat panel_icon: mdi:chat
ports: ports:
80/tcp: null 80/tcp: null

2
thelounge/rootfs/etc/cont-init.d/nginx.sh Normal file → Executable file
View file

@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio #!/command/with-contenv bashio
# ============================================================================== # ==============================================================================
# Home Assistant Community Add-on: The Lounge # Home Assistant Community Add-on: The Lounge
# Configures NGINX for use with thelounge # Configures NGINX for use with thelounge

2
thelounge/rootfs/etc/cont-init.d/thelounge.sh Normal file → Executable file
View file

@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio #!/command/with-contenv bashio
# ============================================================================== # ==============================================================================
# Home Assistant Community Add-on: The Lounge # Home Assistant Community Add-on: The Lounge
# This adds the default user and installs any requested themes # This adds the default user and installs any requested themes

10
thelounge/rootfs/etc/services.d/nginx/finish Normal file → Executable file
View file

@ -1,9 +1,11 @@
#!/usr/bin/execlineb -S0 #!/command/with-contenv bashio
# ============================================================================== # ==============================================================================
# Home Assistant Community Add-on: The Lounge # Home Assistant Community Add-on: The Lounge
# 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 [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
if -n { s6-test ${1} -eq 256 } 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..."

2
thelounge/rootfs/etc/services.d/nginx/run Normal file → Executable file
View file

@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio #!/command/with-contenv bashio
# ============================================================================== # ==============================================================================
# Home Assistant Community Add-on: The Lounge # Home Assistant Community Add-on: The Lounge
# Runs the Nginx daemon # Runs the Nginx daemon

10
thelounge/rootfs/etc/services.d/thelounge/finish Normal file → Executable file
View file

@ -1,9 +1,11 @@
#!/usr/bin/execlineb -S0 #!/command/with-contenv bashio
# ============================================================================== # ==============================================================================
# Home Assistant Community Add-on: The Lounge # Home Assistant Community Add-on: The Lounge
# Take down the S6 supervision tree when the server fails # Take down the S6 supervision tree when the server fails
# ============================================================================== # ==============================================================================
if -n { s6-test $# -ne 0 } if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
if -n { s6-test ${1} -eq 256 } bashio::log.warning "The Lounge crashed, halting add-on"
/run/s6/basedir/bin/halt
fi
s6-svscanctl -t /var/run/s6/services bashio::log.info "The Lounge stopped, restarting..."

2
thelounge/rootfs/etc/services.d/thelounge/run Normal file → Executable file
View file

@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bashio #!/command/with-contenv bashio
# ============================================================================== # ==============================================================================
# Home Assistant Community Add-on: The Lounge # Home Assistant Community Add-on: The Lounge
# Runs The Lounge server # Runs The Lounge server