@wip

Signed-off-by: Oskars Germovs <[email protected]>
Faks · Mar 22, 2024 · 70330c3 · 70330c3
1 parent 0e50d4c
commit 70330c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
@@ -450,6 +450,9 @@ 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
 
+rm -rf /tmp/secure_ssh_keys && \
+rm -rf /tmp/insecure_ssh_keys
+
 RUN if [ ${INSTALL_WORKSPACE_SSH} = true ]; then \
     rm -f /etc/service/sshd/down && \
     cat /tmp/id_rsa.pub >> /root/.ssh/authorized_keys \

diff --git a/workspace/install_ssh_keys.sh b/workspace/install_ssh_keys.sh
@@ -28,12 +28,8 @@ files=("id_rsa" "id_rsa.pub")
 for file in "${files[@]}"; do
     if [ -f "$secure_path/$file" ]; then
         cp "$tmp_dir/$secure_path/$file" "$tmp_dir/$file" || { echo "Failed to copy $tmp_dir/$secure_path/$file."; exit 1; }
-        #rm -rf "$tmp_dir/$secure_path" || { echo "Failed to remove '$tmp_dir/$secure_path'."; exit 1; }
-        #echo "Removed '$tmp_dir/$secure_path'."
     else
         cp "$tmp_dir/$insecure_path/$file" "$tmp_dir/$file" || { echo "Failed to copy $tmp_dir/$insecure_path/$file."; exit 1; }
-        #rm -rf "$tmp_dir/$insecure_path" || { echo "Failed to remove '$tmp_dir/$insecure_path'."; exit 1; }
-        #echo "Removed '$tmp_dir/$insecure_path'."
     fi
 done