From ff3af32124db6a378468cd1a0ff222023ba1c05f Mon Sep 17 00:00:00 2001
From: Franck Nijhof <git@frenck.dev>
Date: Wed, 20 Jul 2022 10:24:43 +0200
Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrades=20add-on=20base?=
 =?UTF-8?q?=20image=20to=206.1.0=20(#477)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⬆️ Upgrades add-on base image to 6.1.0

* Fix halt in finish script
---
 vscode/Dockerfile                        | 6 +++---
 vscode/build.yaml                        | 4 ++--
 vscode/rootfs/etc/services.d/code/finish | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vscode/Dockerfile b/vscode/Dockerfile
index 113ff5f..1ad34e1 100755
--- a/vscode/Dockerfile
+++ b/vscode/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:6.0.0
+ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:6.1.0
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -35,8 +35,8 @@ RUN \
         mosquitto-clients=2.0.11-1 \
         net-tools=1.60+git20181103.0eebece-1 \
         nmap=7.91+dfsg1+really7.80+dfsg1-2 \
-        openssh-client=1:8.4p1-5 \
-        openssl=1.1.1n-0+deb11u2 \
+        openssh-client=1:8.4p1-5+deb11u1 \
+        openssl=1.1.1n-0+deb11u3 \
         python3-dev=3.9.2-3 \
         python3=3.9.2-3 \
         unzip=6.0-26 \
diff --git a/vscode/build.yaml b/vscode/build.yaml
index aac540e..ed0005d 100644
--- a/vscode/build.yaml
+++ b/vscode/build.yaml
@@ -1,7 +1,7 @@
 ---
 build_from:
-  aarch64: ghcr.io/hassio-addons/debian-base/aarch64:6.0.0
-  amd64: ghcr.io/hassio-addons/debian-base/amd64:6.0.0
+  aarch64: ghcr.io/hassio-addons/debian-base:6.1.0
+  amd64: ghcr.io/hassio-addons/debian-base:6.1.0
 codenotary:
   base_image: codenotary@frenck.dev
   signer: codenotary@frenck.dev
diff --git a/vscode/rootfs/etc/services.d/code/finish b/vscode/rootfs/etc/services.d/code/finish
index d83da7d..147ff6e 100755
--- a/vscode/rootfs/etc/services.d/code/finish
+++ b/vscode/rootfs/etc/services.d/code/finish
@@ -5,7 +5,7 @@
 # ==============================================================================
 if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then
   bashio::log.warning "code-server crashed, halting add-on"
-  /run/s6/basedir/bin/halt
+  exec /run/s6/basedir/bin/halt
 fi
 
 bashio::log.info "code-server stopped, restarting..."