Make sure openssh-server and the proper rundir are created before sta…

…rting
MisterTea · Oct 2, 2024 · e6af751 · e6af751
1 parent 69165ca
commit e6af751
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/docker/Dockerfile.client b/docker/Dockerfile.client
@@ -12,7 +12,7 @@ RUN --mount=type=cache,mode=0755,target=/var/lib/apt/lists,sharing=locked \
     apt-get install -y ca-certificates && \
     echo "deb https://github.com/MisterTea/debian-et/raw/master/debian-source/ bookworm main" > /etc/apt/sources.list.d/et.list && \
     apt-get update -qq && \
-    apt-get install -y et
+    apt-get install -y et openssh-server
 
 COPY --chmod=755 container-entrypoint /bin/container-entrypoint
 

diff --git a/docker/Dockerfile.server b/docker/Dockerfile.server
@@ -12,7 +12,7 @@ RUN --mount=type=cache,mode=0755,target=/var/lib/apt/lists,sharing=locked \
     apt-get install -y ca-certificates && \
     echo "deb https://github.com/MisterTea/debian-et/raw/master/debian-source/ bookworm main" > /etc/apt/sources.list.d/et.list && \
     apt-get update -qq && \
-    apt-get install -y et
+    apt-get install -y et openssh-server
 
 COPY --chmod=755 container-entrypoint /bin/container-entrypoint
 

diff --git a/docker/container-entrypoint b/docker/container-entrypoint
@@ -3,6 +3,11 @@
 set -x
 
 if [ "$1" == server ]; then
+    if [ ! -d /run/sshd ]; then
+        mkdir /run/sshd
+        chmod 0755 /run/sshd
+    fi
+
     /usr/sbin/sshd
     shift
     exec etserver --logtostdout -v 1 "$@"