From bbbfa88749d6758eeb73ea5d5839cee6f3cbdfac Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Sun, 12 Apr 2020 16:08:51 +0200
Subject: [PATCH] Update cli & fix s6-overlay shutdown (#1219)

---
 mariadb/CHANGELOG.md | 4 ++++
 mariadb/Dockerfile   | 4 +++-
 mariadb/config.json  | 2 +-
 ssh/CHANGELOG.md     | 4 ++++
 ssh/build.json       | 2 +-
 ssh/config.json      | 2 +-
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/mariadb/CHANGELOG.md b/mariadb/CHANGELOG.md
index 986956c..0da81a2 100644
--- a/mariadb/CHANGELOG.md
+++ b/mariadb/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.2
+
+- Fix S6-Overlay shutdown timeout
+
 ## 2.1.0
 
 - Migrate to S6-Overlay
diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile
index 058b686..431d8b5 100644
--- a/mariadb/Dockerfile
+++ b/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 /
diff --git a/mariadb/config.json b/mariadb/config.json
index 1635433..67f19b8 100644
--- a/mariadb/config.json
+++ b/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",
diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md
index 01c9b9e..cac7681 100644
--- a/ssh/CHANGELOG.md
+++ b/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
diff --git a/ssh/build.json b/ssh/build.json
index 9ecaa8f..ba4189b 100644
--- a/ssh/build.json
+++ b/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"
   }
diff --git a/ssh/config.json b/ssh/config.json
index 03d3a8f..b10ba52 100644
--- a/ssh/config.json
+++ b/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",