Use supervisord to allow clean exits of container

realk1ko · realk1ko · commit ce3b0d0fb6f7 · 2022-11-24T15:12:41.000+01:00
diff --git a/Dockerfile b/Dockerfile
@@ -15,11 +15,11 @@ ADD ./container /
 ADD ./LICENSE /
 
 RUN set -euo pipefail && \
-    dnf install -y cockpit-ws-${COCKPIT_VERSION} cockpit-bridge-${COCKPIT_VERSION} python3 openssh-clients && \
+    dnf install -y supervisor cockpit-ws-${COCKPIT_VERSION} cockpit-bridge-${COCKPIT_VERSION} python3 openssh-clients && \
     dnf clean all && \
     echo "NAME=default\nID=default" > /etc/os-release && \
     chmod 755 /usr/local/bin/*
 
 ENV COCKPIT_SSH_KEY_PATH /etc/cockpit/identity
 
-CMD ["/usr/local/bin/start"]
+ENTRYPOINT [ "/usr/bin/supervisord", "-c", "/etc/supervisord.conf" ]
diff --git a/README.md b/README.md
@@ -86,19 +86,18 @@ You can also specify the `known_hosts` file Cockpit will use to check fingerprin
 The default template for the `cockpit.conf` only allows username and password authentication.
 
 However, the image comes pre-packaged with an
-[utility](https://github.com/realk1ko/cockpit-container/blob/main/container/usr/local/bin/cockpit-auth-ssh-key) created
-by
-the [Cockpit Project Team](https://github.com/cockpit-project) that allows you to use a **single** specific SSH key as
-identity for Cockpit when connecting to managed hosts.
+[utility](https://github.com/realk1ko/cockpit-container/blob/main/container/usr/local/libexec/cockpit-auth-ssh-key)
+created by the [Cockpit Project Team](https://github.com/cockpit-project) that allows you to use a **single** specific
+SSH key as identity for Cockpit when connecting to managed hosts.
 
 To use key authentication you will need to append the following lines to the `cockpit.conf` file:
 
 ```
 [Basic]
-Command = /usr/local/bin/cockpit-auth-ssh-key
+Command = /usr/local/libexec/cockpit-auth-ssh-key
 
 [Ssh-Login]
-Command = /usr/local/bin/cockpit-auth-ssh-key
+Command = /usr/local/libexec/cockpit-auth-ssh-key
 ```
 
 Per default the container will use the key stored at `/etc/cockpit/identity`, if it exists. You can provide such a file
diff --git a/container/etc/supervisord.conf b/container/etc/supervisord.conf
@@ -0,0 +1,22 @@
+[supervisord]
+nodaemon=true
+pidfile=/tmp/supervisord.pid
+logfile=/dev/fd/1
+logfile_maxbytes=0
+user=root
+group=root
+
+[program:ssh-agent]
+priority=0
+command=/usr/bin/ssh-agent -D -a /tmp/ssh-agent.sock
+autorestart=true
+user=root
+group=root
+
+[program:cockpit-start]
+priority=1
+environment=SSH_AUTH_SOCK=/tmp/ssh-agent.sock
+command=/usr/local/bin/cockpit-start
+autorestart=true
+user=root
+group=root
diff --git a/container/usr/local/bin/cockpit-start b/container/usr/local/bin/cockpit-start
@@ -11,8 +11,5 @@ set -euo pipefail
 # create default configuration file if it does not exist
 [[ -f /etc/cockpit/cockpit.conf ]] || cp /usr/local/etc/cockpit-container/cockpit.conf.template /etc/cockpit/cockpit.conf
 
-# startup of ssh-agent
-eval $(ssh-agent -s)
-
 # startup of cockpit
 exec /usr/libexec/cockpit-ws --local-ssh
diff --git a/container/usr/local/libexec/cockpit-auth-ssh-key b/container/usr/local/libexec/cockpit-auth-ssh-key
