From 6d9b157735a968706b71c913d3e8c8e442fef16a Mon Sep 17 00:00:00 2001
From: giomba <giomba@linux.it>
Date: Sat, 18 Jun 2022 11:28:23 +0200
Subject: [PATCH] thttpd: generalize password setup.

---
 thttpd/Dockerfile    |  3 ---
 thttpd/entrypoint.sh | 10 ++++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/thttpd/Dockerfile b/thttpd/Dockerfile
index 08b6133..e11367e 100644
--- a/thttpd/Dockerfile
+++ b/thttpd/Dockerfile
@@ -8,9 +8,6 @@ RUN apk add thttpd
 RUN apk add openssh-server
 RUN apk add openssh-sftp-server
 RUN rm -rf /etc/ssh/ssh_host_*_key
-RUN ssh-keygen -A
-
-RUN echo "root:G/4YVyjqFxVud2It1HSJ2Z3Zobc0/JvnpHBSEmaY2e4" | chpasswd
 
 ENTRYPOINT ["/entrypoint.sh"]
 
diff --git a/thttpd/entrypoint.sh b/thttpd/entrypoint.sh
index e5dc31b..0f84eb5 100755
--- a/thttpd/entrypoint.sh
+++ b/thttpd/entrypoint.sh
@@ -1,5 +1,15 @@
 #!/bin/sh
 
+# On first startup, generate new ssh key
+if [[ $(ls -1 /etc/ssh/ssh_host_*_key | wc -l) -eq 0 ]]; then
+    ssh-keygen -A
+fi
+
+# Change ssh user password if required
+if [[ ! -z "${THTTPD_SSH_USER}" && ! -z "${THTTPD_SSH_PASSWORD}" ]]; then
+    echo "${THTTPD_SSH_USER}:${THTTPD_SSH_PASSWORD}" | chpasswd
+fi
+
 /usr/sbin/sshd -f /etc/ssh/sshd_config
 thttpd -D -d /html