⬆️ Upgrades add-on base image to 6.0.0 (#312)

jupyterlab/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}
 
@@ -19,27 +19,27 @@ RUN \
     && apt-get update \
     && apt-get install -y --no-install-recommends \
         build-essential=12.9 \
-        dirmngr=2.2.27-2 \
+        dirmngr=2.2.27-2+deb11u1 \
         git=1:2.30.2-1 \
-        gpg-agent=2.2.27-2 \
-        gpg=2.2.27-2 \
+        gpg-agent=2.2.27-2+deb11u1 \
+        gpg=2.2.27-2+deb11u1 \
         libffi-dev=3.3-6 \
         libffi7=3.3-6 \
         libfreetype6-dev=2.10.4+dfsg-1 \
         libfreetype6=2.10.4+dfsg-1 \
         libjpeg62-turbo-dev=1:2.0.6-4 \
         libjpeg62-turbo=1:2.0.6-4 \
-        libmariadb-dev=1:10.5.12-0+deb11u1 \
-        libmariadb3=1:10.5.12-0+deb11u1 \
+        libmariadb-dev=1:10.5.15-0+deb11u1 \
+        libmariadb3=1:10.5.15-0+deb11u1 \
         libnginx-mod-http-lua=1.18.0-6.1 \
         libpng-dev=1.6.37-3 \
         libpng16-16=1.6.37-3 \
         libpq-dev=13.5-0+deb11u1 \
         libpq5=13.5-0+deb11u1 \
-        libssl-dev=1.1.1k-1+deb11u1 \
+        libssl-dev=1.1.1n-0+deb11u2 \
         libtiff5-dev=4.2.0-1 \
-        libxml2-dev=2.9.10+dfsg-6.7 \
-        libxml2=2.9.10+dfsg-6.7 \
+        libxml2-dev=2.9.10+dfsg-6.7+deb11u1 \
+        libxml2=2.9.10+dfsg-6.7+deb11u1 \
         libxslt1-dev=1.1.34-4 \
         libxslt1.1=1.1.34-4 \
         libzmq3-dev=4.3.4-1 \
@@ -50,12 +50,12 @@ RUN \
         python3-dev=3.9.2-3 \
         python3-distutils=3.9.2-1 \
         python3-minimal=3.9.2-3 \
-        zlib1g-dev=1:1.2.11.dfsg-2 \
+        zlib1g-dev=1:1.2.11.dfsg-2+deb11u1 \
     \
     && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
     \
     && apt-get install -y --no-install-recommends \
-        nodejs=14.19.1-deb-1nodesource1 \
+        nodejs=14.19.3-deb-1nodesource1 \
     \
     && curl https://bootstrap.pypa.io/get-pip.py | python3 \
     \

jupyterlab/build.yaml

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

jupyterlab/config.yaml

@@ -11,6 +11,7 @@ arch:
   - aarch64
   - amd64
 homeassistant_api: true
+init: false
 map:
   - config:rw
   - share:rw

jupyterlab/rootfs/etc/cont-init.d/jupyter.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: JupyterLab
 # Configure JupterLabs

jupyterlab/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: JupyterLab
 # Configures NGINX for use with JupyterLab

jupyterlab/rootfs/etc/cont-init.d/notebooks.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: JupyterLab
 # Ensures the JupyterLab notebooks directory exists

jupyterlab/rootfs/etc/cont-init.d/system-packages.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: JupyterLab
 # Install user configured requested packages & commands

jupyterlab/rootfs/etc/services.d/jupyter/finish

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

jupyterlab/rootfs/etc/services.d/jupyter/run

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bashio
+#!/command/with-contenv bashio
 # shellcheck disable=SC2191
 # ==============================================================================
 # Home Assistant Community Add-on: JupyterLab

jupyterlab/rootfs/etc/services.d/nginx/finish

@@ -1,4 +1,4 @@
-#!/usr/bin/execlineb -S0
+#!/command/with-contenv bashio
 # ==============================================================================
 # Home Assistant Community Add-on: JupyterLab
 # Take down the S6 supervision tree when Nginx fails

jupyterlab/rootfs/etc/services.d/nginx/run

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