diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c3e5e625d1e7d59eb8c1b8e88f04f6248b124e9..627e17d45556594fd6cb5876eba07e7c47612c28 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 15401652c726f6b2fcd0eb349bbce5bc3c0941ed..a2a57534b08dd11da5255c342d5c47bddc7e3e35 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