From 8dfe13796487d409444849ce183485e315ad2b02 Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Fri, 19 Apr 2019 17:29:29 +0200 Subject: [PATCH] new: add ssh to docker image to support git ``host-resources`` on ssh. --- Dockerfile | 3 +++ bin/compose | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/Dockerfile b/Dockerfile index 28a250e..06dbe7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -112,6 +112,9 @@ RUN apk add jq ## requiring ``getfacl/setfacl`` command for allowing to setup some permissions in charms RUN apk add acl +## required by git through ssh (for host-resources for instance) +RUN apk add openssh-client + ## install compose COPY ./bin/ /usr/local/bin/ diff --git a/bin/compose b/bin/compose index 10cc93b..35aca98 100755 --- a/bin/compose +++ b/bin/compose @@ -209,6 +209,12 @@ mk_docker_run_options() { COMPOSE_DOCKER_IMAGE=${COMPOSE_DOCKER_IMAGE:-docker.0k.io/compose} docker_run_opts+=("-e" "COMPOSE_DOCKER_IMAGE=$COMPOSE_DOCKER_IMAGE") + ## SSH config + docker_run_opts+=( + "-v" "/root/.ssh:/root/.ssh:ro" + "-v" "/etc/ssh:/etc/ssh" + ) + COMPOSE_LAUNCHER_BIN=$(readlink -f "${BASH_SOURCE[0]}") docker_run_opts+=("-v" "$COMPOSE_LAUNCHER_BIN:/usr/local/bin/compose")