From bfc3065a461f1b7d471dd651de313352d15ec4f2 Mon Sep 17 00:00:00 2001 From: nabilelmahiri <nabil.elmahiri@fractalite.com> Date: Tue, 5 Mar 2019 14:29:45 +0100 Subject: [PATCH] using npm login --- .gitlab-ci.yml | 2 +- docker/Dockerfile | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0ad0fb..0ba96b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ variables: CI_DEBUG_TRACE: "true" before_script: - # - git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@labs.atlasvoyages.com/".insteadOf "git@labs.atlasvoyages.com:" + - git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@labs.atlasvoyages.com/".insteadOf "git@labs.atlasvoyages.com:" - docker info - echo $CI_BUILD_REF - echo $CI_PROJECT_DIR diff --git a/docker/Dockerfile b/docker/Dockerfile index ab84977..ce9df41 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -53,9 +53,6 @@ COPY package*.json /atlasvoyages/ # Take an SSH key as a build argument. ARG SSH_PRIVATE_KEY -# Install dependencies required to git clone. -RUN apt-get -y install openssh-server - # 1. Create the SSH directory. # 2. Populate the private key file. # 3. Set the required permissions. @@ -63,7 +60,8 @@ RUN apt-get -y install openssh-server RUN mkdir -p /root/.ssh/ && \ echo "$SSH_PRIVATE_KEY" > /root/.ssh/id_rsa && \ chmod -R 600 /root/.ssh/ && \ - ssh-keyscan -t rsa labs.atlasvoyages.com >> ~/.ssh/known_hosts + ssh-keyscan labs.atlasvoyages.com >> /root/.ssh/known_hosts + RUN git clone git@labs.atlasvoyages.com:pine/theme-atlasvoyages.git -b 0.3-beta-v1 -- libgit2 0.26.0