diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb9ad0a06b0e0cd7dd554d2448484321d6eac3ec..1d27139ff2d3022f2f2e9966b3544e7a297213d6 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 a2a57534b08dd11da5255c342d5c47bddc7e3e35..dc417f9fe5bbff5ccde78b9c5c57a43411a3759e 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