Update cli & fix s6-overlay shutdown (#1219)

mariadb/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.2
+
+- Fix S6-Overlay shutdown timeout
+
 ## 2.1.0
 
 - Migrate to S6-Overlay

mariadb/Dockerfile

@@ -21,7 +21,9 @@ RUN apk add --no-cache --virtual .build-deps \
     && apk del .build-deps \
     && rm -rf /usr/src/jemalloc-${JEMALLOC_VERSION}
 
-ENV LD_PRELOAD="/usr/local/lib/libjemalloc.so.2"
+ENV \
+    LD_PRELOAD="/usr/local/lib/libjemalloc.so.2" \
+    S6_SERVICES_GRACETIME=18000
 
 # Copy data
 COPY rootfs /

mariadb/config.json

@@ -1,6 +1,6 @@
 {
   "name": "MariaDB",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "slug": "mariadb",
   "description": "An SQL database server",
   "url": "https://github.com/home-assistant/hassio-addons/tree/master/mariadb",

ssh/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 8.5.4
+
+- Update Home Assistant CLI to 4.3.0
+
 ## 8.5.3
 
 - Update Home Assistant CLI to 4.2.0

ssh/build.json

@@ -7,7 +7,7 @@
     "i386": "homeassistant/i386-base:3.11"
   },
   "args": {
-    "CLI_VERSION": "4.2.0",
+    "CLI_VERSION": "4.3.0",
     "LIBWEBSOCKETS_VERSION": "v3.2.2",
     "TTYD_VERSION": "1.6.0"
   }

ssh/config.json

@@ -1,6 +1,6 @@
 {
   "name": "Terminal & SSH",
-  "version": "8.5.3",
+  "version": "8.5.4",
   "slug": "ssh",
   "description": "Allow logging in remotely to Home Assistant using SSH",
   "url": "https://github.com/home-assistant/hassio-addons/tree/master/ssh",