From 9dddccb4009e844a6d415f311a219bed76f4ea6a Mon Sep 17 00:00:00 2001 From: Oskars Germovs Date: Sat, 23 Mar 2024 02:50:27 +0200 Subject: [PATCH] @wip Signed-off-by: Oskars Germovs --- workspace/Dockerfile | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/workspace/Dockerfile b/workspace/Dockerfile index 6b2efe2522..c60e7d57ca 100644 --- a/workspace/Dockerfile +++ b/workspace/Dockerfile @@ -436,25 +436,27 @@ RUN if [ ${INSTALL_XDEBUG} = false -a ${INSTALL_BLACKFIRE} = true ]; then \ ARG INSTALL_WORKSPACE_SSH=false -RUN mkdir -p /tmp/secure_ssh_keys && \ - mkdir -p /tmp/insecure_ssh_keys && \ - chmod 7777 /tmp/secure_ssh_keys && \ - chmod 7777 /tmp/insecure_ssh_keys - -COPY secure_ssh_keys/id_rsa /tmp/secure_ssh_keys/ -COPY secure_ssh_keys/id_rsa.pub /tmp/secure_ssh_keys/ -COPY insecure_id_rsa /tmp/insecure_ssh_keys/ -COPY insecure_id_rsa.pub /tmp/insecure_ssh_keys/ +RUN mkdir -p /tmp/insecure_ssh_keys \ + && mkdir -p /tmp/secure_ssh_keys \ + && chmod 7777 /tmp/insecure_ssh_keys \ + && chmod 7777 /tmp/secure_ssh_keys + +COPY insecure_id_rsa /tmp/insecure_ssh_keys/insecure_id_rsa +COPY insecure_id_rsa.pub /tmp/insecure_ssh_keys/insecure_id_rsa.pub + +COPY secure_ssh_keys/id_rsa /tmp/secure_ssh_keys/id_rsa +COPY secure_ssh_keys/id_rsa.pub /tmp/secure_ssh_keys/id_rsa.pub + COPY install_ssh_keys.sh /usr/local/bin/install_ssh_keys.sh RUN chmod +x /usr/local/bin/install_ssh_keys.sh RUN /usr/local/bin/install_ssh_keys.sh RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \ - rm -rf /tmp/secure_ssh_keys && \ - rm -rf /tmp/insecure_ssh_keys && \ - rm -f /etc/service/sshd/down && \ - cat /tmp/id_rsa.pub >> /root/.ssh/authorized_keys \ + && rm -rf /tmp/secure_ssh_keys \ + && rm -rf /tmp/insecure_ssh_keys \ + && rm -f /etc/service/sshd/down \ + && cat /tmp/id_rsa.pub >> /root/.ssh/authorized_keys \ && cat /tmp/id_rsa.pub >> /root/.ssh/id_rsa.pub \ && cat /tmp/id_rsa >> /root/.ssh/id_rsa \ && rm -f /tmp/id_rsa* \