Fix key-chain

Dockerfile

@@ -19,13 +19,13 @@ RUN \
   echo "**** install runtime dependencies ****" && \
   apt-get update && \
   apt-get install -y \
-    dbus-x11 \
     git \
     nano \
     net-tools \
     netcat \
     sudo && \
   apt-get install -y --no-install-recommends \
+    dbus-x11 \
     gnome-keyring \
     libatomic1 \
     libsecret-1-dev && \

root/etc/s6-overlay/s6-rc.d/init-keyring/run

@@ -0,0 +1,16 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+mkdir -p /config/.local/share/keyrings
+
+if [ -f /etc/machine-id ]; then
+    dbus-uuidgen --ensure
+    sleep 1
+fi
+
+echo "keyring"
+eval $(s6-setuidgid abc dbus-launch --sh-syntax)
+echo 'somecredstorepass' | eval $(s6-setuidgid abc gnome-keyring-daemon --daemonize --components=pkcs11,secrets,ssh --unlock)
+echo -n "${DBUS_SESSION_BUS_ADDRESS}" >/run/s6/container_environment/DBUS_SESSION_BUS_ADDRESS
+#echo -n "${GNOME_KEYRING_CONTROL}" >/run/s6/container_environment/GNOME_KEYRING_CONTROL
+#echo -n "${SSH_AUTH_SOCK}" >/run/s6/container_environment/SSH_AUTH_SOCK

root/etc/s6-overlay/s6-rc.d/init-keyring/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-keyring/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-keyring/run

root/etc/s6-overlay/s6-rc.d/init-vscode-server/run

@@ -30,17 +30,6 @@ for f in code_tunnel.json last-used-servers.json license_consent.json token.json
     fi
 done
 
-if [ -f /etc/machine-id ]; then
-    dbus-uuidgen --ensure
-    sleep 1
-fi
-
-if [ -z "${DBUS_SESSION_BUS_PID}" ]; then
-    eval $(s6-setuidgid abc dbus-launch)
-    echo -n "${DBUS_SESSION_BUS_ADDRESS}" >/run/s6/container_environment/DBUS_SESSION_BUS_ADDRESS
-    echo -n "${DBUS_SESSION_BUS_PID}" >/run/s6/container_environment/DBUS_SESSION_BUS_PID
-fi
-
 
 [[ ! -f /config/.bashrc ]] && \
     cp /root/.bashrc /config/.bashrc

root/etc/s6-overlay/s6-rc.d/svc-dbus/run

@@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-exec \
-    dbus-daemon --system --nofork

root/etc/s6-overlay/s6-rc.d/svc-dbus/type

@@ -1 +0,0 @@
-longrun