From 6f2657db17118e120be56d7488dd80fabed7412f Mon Sep 17 00:00:00 2001 From: PeterNashaat Date: Thu, 27 Jun 2024 07:22:53 +0000 Subject: [PATCH] adding multiple ssh support to arch flist --- tfgrid3/arch_mycelium/Dockerfile | 7 +------ tfgrid3/arch_mycelium/zinit/ssh_config.yaml | 1 - tfgrid3/arch_mycelium/zinit/sshd.yaml | 3 +-- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/tfgrid3/arch_mycelium/Dockerfile b/tfgrid3/arch_mycelium/Dockerfile index 01ad0716..2058226f 100644 --- a/tfgrid3/arch_mycelium/Dockerfile +++ b/tfgrid3/arch_mycelium/Dockerfile @@ -1,4 +1,4 @@ -FROM archlinux:latest +FROM archlinux:base-20240101.0.204074 # Update system and install packages RUN pacman -Syu --noconfirm && \ @@ -16,11 +16,6 @@ COPY scripts/ufw.sh /usr/local/bin/ # Adding zinit config files ADD zinit /etc/zinit/ -# Install latest mycelium -RUN mycelium_version=$(curl -s https://api.github.com/repos/threefoldtech/mycelium/releases/latest | grep 'tag_name' | cut -d '"' -f 4 ) && \ - wget "https://github.com/threefoldtech/mycelium/releases/download/${mycelium_version}/mycelium-x86_64-unknown-linux-musl.tar.gz" && \ - tar -xzf mycelium-x86_64-unknown-linux-musl.tar.gz -C /usr/local/bin/ - # Cleaning up RUN pacman -Scc --noconfirm diff --git a/tfgrid3/arch_mycelium/zinit/ssh_config.yaml b/tfgrid3/arch_mycelium/zinit/ssh_config.yaml index 366bede2..77ab4250 100644 --- a/tfgrid3/arch_mycelium/zinit/ssh_config.yaml +++ b/tfgrid3/arch_mycelium/zinit/ssh_config.yaml @@ -5,6 +5,5 @@ exec: /bin/sh -eux -c " chmod 600 /etc/ssh/*; touch ~/.ssh/authorized_keys; chmod 600 ~/.ssh/authorized_keys; - echo $SSH_KEY > /root/.ssh/authorized_keys; echo 'ssh configured'" oneshot: true diff --git a/tfgrid3/arch_mycelium/zinit/sshd.yaml b/tfgrid3/arch_mycelium/zinit/sshd.yaml index 3d2ac4a9..ff4f8287 100644 --- a/tfgrid3/arch_mycelium/zinit/sshd.yaml +++ b/tfgrid3/arch_mycelium/zinit/sshd.yaml @@ -1,4 +1,3 @@ -exec: /bin/sh -c " set -x ; - /usr/sbin/sshd;" +exec: /usr/sbin/sshd -D after: - ssh_config