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

This commit is contained in:
Franck Nijhof 2022-06-11 12:24:17 +02:00 committed by GitHub
parent 0c3e0e354b
commit 63969da7a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 24 additions and 20 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
FROM ${BUILD_FROM}
@ -15,9 +15,9 @@ WORKDIR /opt/traccar
RUN \
apk add --no-cache \
mariadb-client=10.6.8-r0 \
nginx=1.20.2-r1 \
nss=3.76.1-r0 \
openjdk11-jre-headless=11.0.15_p10-r0 \
nginx=1.22.0-r0 \
nss=3.78.1-r0 \
openjdk11-jre-headless=11.0.15_p10-r1 \
xmlstarlet=1.6.1-r0 \
\
&& curl -J -L -o /tmp/traccar.zip \

View file

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

2
traccar/rootfs/etc/cont-init.d/mysql.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: Traccar
# Pre-configures the MySQL clients, if the service is available

2
traccar/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: Traccar
# Configures NGINX for use with the Traccar server

2
traccar/rootfs/etc/cont-init.d/traccar.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: Traccar
# Ensures the user configuration file is present

12
traccar/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: Traccar
# 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..."

2
traccar/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: Traccar
# Runs the Nginx daemon

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

@ -1,9 +1,11 @@
#!/usr/bin/execlineb -S0
#!/command/with-contenv bashio
# ==============================================================================
# Home Assistant Community Add-on: Traccar
# Take down the S6 supervision tree when the Traccar daemon 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 "Traccar crashed, halting add-on"
/run/s6/basedir/bin/halt
fi
s6-svscanctl -t /var/run/s6/services
bashio::log.info "Traccar stopped, restarting..."

2
traccar/rootfs/etc/services.d/traccar/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: Traccar
# Runs the Traccar daemon