Merge pull request #266 from threefoldtech/forum_multissh

multiple ssh support
threefoldtech · Jun 26, 2024 · c551ac2 · c551ac2
2 parents c0df6d6 + 3f05058
commit c551ac2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/tfgrid3/forum-3/Dockerfile b/tfgrid3/forum-3/Dockerfile
@@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update && \
     apt -y install wget curl vim net-tools iputils-ping openssh-server docker.io git nginx
 
-RUN wget -O /sbin/zinit https://github.com/threefoldtech/zinit/releases/download/v0.2.5/zinit && \
+RUN wget -O /sbin/zinit https://github.com/threefoldtech/zinit/releases/download/v0.2.14/zinit && \
     chmod +x /sbin/zinit
 
 RUN mkdir -p /etc/zinit

diff --git a/tfgrid3/forum-3/zinit/sshd.yaml b/tfgrid3/forum-3/zinit/sshd.yaml
@@ -1 +1 @@
-exec: bash -c "/usr/sbin/sshd -D"
+exec: /usr/sbin/sshd -D
diff --git a/tfgrid3/forum-3/zinit/sshkey.yaml b/tfgrid3/forum-3/zinit/sshkey.yaml
@@ -7,8 +7,6 @@ exec: |
       
       chmod 700 /root/.ssh
       chmod 600 /root/.ssh/authorized_keys
-
-      echo "$SSH_KEY" >> /root/.ssh/authorized_keys
     fi
   '
-oneshot: true
+oneshot: true
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		exec: bash -c "/usr/sbin/sshd -D"
		exec: /usr/sbin/sshd -D