From 54f8fbceee86ae9353b32da24e38e2e62383c099 Mon Sep 17 00:00:00 2001 From: Eddy PEPY Date: Thu, 9 Nov 2023 15:51:18 +0100 Subject: [PATCH 1/2] Add openssh-client and mount ssh user dir to docker image --- automation/TFEnv/Dockerfile | 1 + docker-compose.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/automation/TFEnv/Dockerfile b/automation/TFEnv/Dockerfile index ea7d106..789fd8d 100644 --- a/automation/TFEnv/Dockerfile +++ b/automation/TFEnv/Dockerfile @@ -7,6 +7,7 @@ RUN apk add --no-cache --purge \ python3 py3-pip \ git \ wget \ + openssh-client \ ; ARG TFENV_VERSION diff --git a/docker-compose.yml b/docker-compose.yml index 04e7eeb..689156e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,6 +20,7 @@ services: - /etc/passwd:/etc/passwd:ro - /etc/group:/etc/group:ro - ./:/workdir + - $HOME/.ssh:$HOME/.ssh - $HOME/.terraformrc:$HOME/.terraformrc - $HOME/.terraform.d:$HOME/.terraform.d working_dir: /workdir From 9ab155fa2952e18008dc29e0282216f205476ad1 Mon Sep 17 00:00:00 2001 From: Eddy PEPY Date: Thu, 9 Nov 2023 15:55:02 +0100 Subject: [PATCH 2/2] Add corkscrew for ssh over http proxy --- automation/TFEnv/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/automation/TFEnv/Dockerfile b/automation/TFEnv/Dockerfile index 789fd8d..fad402d 100644 --- a/automation/TFEnv/Dockerfile +++ b/automation/TFEnv/Dockerfile @@ -10,6 +10,12 @@ RUN apk add --no-cache --purge \ openssh-client \ ; +RUN apk --update --no-cache --allow-untrusted --repository http://dl-cdn.alpinelinux.org/alpine/edge/community add \ + corkscrew \ + && rm -rf /var/cache/apk/* \ + /tmp/* \ + /var/tmp/* + ARG TFENV_VERSION RUN wget -O /tmp/tfenv.tar.gz "https://github.com/tfutils/tfenv/archive/refs/tags/v${TFENV_VERSION}.tar.gz" \