From 92cefd6fcd5a7f553733c6620c78e107328ecf7d Mon Sep 17 00:00:00 2001 From: Aleksandr Ivanov Date: Wed, 11 Jun 2025 20:47:53 +0300 Subject: [PATCH] + use ssh key from host machine in workspace container --- .env.example | 1 + docker-compose.base.yml | 1 + dockerfiles/workspace/workspace.base.Dockerfile | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/.env.example b/.env.example index 00687ae..b3bf956 100644 --- a/.env.example +++ b/.env.example @@ -17,6 +17,7 @@ WORKSPACE_PGID=1000 WORKSPACE_INSTALL_YADM=true WORKSPACE_INSTALL_FINE_UTILS=true +WORKSPACE_INSTALL_SSH=true WORKSPACE_PHP_OPT_MEMORY_LIMIT=-1 diff --git a/docker-compose.base.yml b/docker-compose.base.yml index 5e5701f..293df7e 100755 --- a/docker-compose.base.yml +++ b/docker-compose.base.yml @@ -41,6 +41,7 @@ services: - CUSTOM_PGID=${WORKSPACE_PGID} - INSTALL_YADM=${WORKSPACE_INSTALL_YADM} - INSTALL_FINE_UTILS=${WORKSPACE_INSTALL_FINE_UTILS} + - INSTALL_SSH=${WORKSPACE_INSTALL_SSH} - PHP_OPT_MEMORY_LIMIT=${WORKSPACE_PHP_OPT_MEMORY_LIMIT} # Other args that might be used for customize in every separate container # - CUSTOM_COMPOSER_VERSION=1 diff --git a/dockerfiles/workspace/workspace.base.Dockerfile b/dockerfiles/workspace/workspace.base.Dockerfile index a3005de..51a1bf1 100644 --- a/dockerfiles/workspace/workspace.base.Dockerfile +++ b/dockerfiles/workspace/workspace.base.Dockerfile @@ -126,9 +126,32 @@ RUN if [ ${INSTALL_NODE} = true ]; then \ ;fi ########################################################################### +# ssh: +########################################################################### + +USER root + +ARG INSTALL_SSH=false +ENV INSTALL_SSH ${INSTALL_SSH} + +RUN if [ ${INSTALL_SSH} = true ]; then \ + rm -f /etc/service/sshd/down \ +;fi + +USER laradock + +RUN if [ ${INSTALL_SSH} = true ]; then \ + mkdir -p ~/.ssh \ + && ln -s /run/secrets/user_ssh_key ~/.ssh/id_rsa \ + && ln -s /run/secrets/user_known_hosts ~/.ssh/known_hosts \ +;fi + +########################################################################### # APT ########################################################################### +USER root + # once please RUN apt update -qq