From 3c7e62b5095d689cf7a375bb391b847bb4e9c039 Mon Sep 17 00:00:00 2001
From: zimniy <zimniy@cyberbrain.pw>
Date: Sun, 19 Jul 2020 16:56:53 +0300
Subject: [PATCH] Linter fixes 6
---
.gitlab-ci.yml | 4 ++--
Dockerfile | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb9ad0a..1d27139 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,9 +46,9 @@ build:
variables:
GIT_DEPTH: 1
script:
- - echo "APPS - [${APPS}]"
+ - echo "Runtime dependencies - [${DEPENDENCIES_RUNTIME}]"
- 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 --build-arg DEPENDENCIES_RUNTIME="${APPS}" .
+ - docker build --cache-from "${CI_REGISTRY_IMAGE}:latest" -t "${CI_REGISTRY_IMAGE}:temp-${CI_PIPELINE_IID}" -f ./Dockerfile --build-arg DEPENDENCIES_RUNTIME="${DEPENDENCIES_RUNTIME}" .
- docker push "${CI_REGISTRY_IMAGE}:temp-$CI_PIPELINE_IID"
##########################################################################################################
diff --git a/Dockerfile b/Dockerfile
index a2a5753..dc417f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,8 @@ FROM pipelinecomponents/ansible-lint:latest
ENV LANG C.UTF-8
+ARG DEPENDENCIES_RUNTIME
#ARG DEPENDENCIES_RUNTIME="git openssh-client rsync"
-RUN apk add --no-cache $DEPENDENCIES_RUNTIME
+RUN apk add --no-cache "${DEPENDENCIES_RUNTIME}"
WORKDIR /opt/ansible
--
GitLab