From 9e83bca66f2f2be74d95d340fae88bc5ac2c57c3 Mon Sep 17 00:00:00 2001
From: zimniy <zimniy@cyberbrain.pw>
Date: Sun, 19 Jul 2020 15:29:19 +0300
Subject: [PATCH] DEPENDENCIES_RUNTIME

---
 .gitlab-ci.yml | 5 ++++-
 Dockerfile     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c3e5e6..627e17d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ build:
     GIT_DEPTH: 1
   script:
     - docker pull "${CI_REGISTRY_IMAGE}:latest" || true
-    - docker build --cache-from "${CI_REGISTRY_IMAGE}:latest" -t "${CI_REGISTRY_IMAGE}:temp-${CI_PIPELINE_IID}" -f ./Dockerfile .
+    - docker build --build-arg DEPENDENCIES_RUNTIME="${DEPENDENCIES_RUNTIME}" --cache-from "${CI_REGISTRY_IMAGE}:latest" -t "${CI_REGISTRY_IMAGE}:temp-${CI_PIPELINE_IID}" -f ./Dockerfile .
     - docker push "${CI_REGISTRY_IMAGE}:temp-$CI_PIPELINE_IID"
 
 ##########################################################################################################
@@ -63,6 +63,9 @@ test:
     - drr "${CI_REGISTRY_IMAGE}:temp-$CI_PIPELINE_IID" ansible -m ping localhost
     - drr "${CI_REGISTRY_IMAGE}:temp-$CI_PIPELINE_IID" ansible-lint --version
     - drr "${CI_REGISTRY_IMAGE}:temp-$CI_PIPELINE_IID" ansible-lint .
+    - drr "${CI_REGISTRY_IMAGE}:temp-$CI_PIPELINE_IID" ssh --version
+    - drr "${CI_REGISTRY_IMAGE}:temp-$CI_PIPELINE_IID" git --version
+    - drr "${CI_REGISTRY_IMAGE}:temp-$CI_PIPELINE_IID" rsync --version
 
 ##########################################################################################################
 
diff --git a/Dockerfile b/Dockerfile
index 1540165..a2a5753 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM pipelinecomponents/ansible-lint:latest
 
 ENV LANG C.UTF-8
 
-ARG DEPENDENCIES_RUNTIME="git openssh-client rsync"
+#ARG DEPENDENCIES_RUNTIME="git openssh-client rsync"
 RUN apk add --no-cache $DEPENDENCIES_RUNTIME
 
 WORKDIR /opt/ansible
-- 
GitLab