From 1f9860a70788c69b7d704075b511aef92651a6fc Mon Sep 17 00:00:00 2001 From: s3lph Date: Wed, 11 Jul 2018 17:34:59 +0200 Subject: [PATCH] Install a SSH client in the CI Docker image. --- .gitlab-ci.yml | 5 +++-- testing/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98df15d..6550324 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ --- -image: s3lph/matemat-ci:20180711-01 +image: s3lph/matemat-ci:20180711-02 stages: - test @@ -30,7 +30,8 @@ build: staging: stage: staging script: - - ssh add - <<<"$STAGING_SSH_PRIVATE_KEY" + - eval $(ssh-agent -s) + - ssh-add - <<<"$STAGING_SSH_PRIVATE_KEY" - echo "$(git rev-parse HEAD)" | ssh -p 20022 matemat@kernelpanic.lol environment: name: staging diff --git a/testing/Dockerfile b/testing/Dockerfile index a06b6ed..c51e01b 100644 --- a/testing/Dockerfile +++ b/testing/Dockerfile @@ -5,7 +5,7 @@ RUN useradd -d /home/matemat -m matemat RUN mkdir -p /var/matemat/db && chown matemat:matemat -R /var/matemat/db RUN mkdir -p /var/matemat/upload && chown matemat:matemat -R /var/matemat/upload RUN apt-get update -qy -RUN apt-get install -y --no-install-recommends sudo git docker.io python3-dev python3-pip python3-coverage python3-setuptools build-essential +RUN apt-get install -y --no-install-recommends sudo openssh-client git docker.io python3-dev python3-pip python3-coverage python3-setuptools build-essential RUN pip3 install wheel pycodestyle mypy WORKDIR /home/matemat