diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60b4edfc8a2a65a469087fdc75a330b53d6caea9..356b9508d813dfba0b3f7798837df800c8c1a826 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,15 +16,11 @@ stages: #### TEST SECTION test: - image: ${DOCKER_IMAGE} - services: - - ${DIND_IMAGE} + extends: .common stage: test variables: GIT_STRATEGY: "none" script: - - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY - - alias drr="docker run --rm -v \${PWD}:\${PWD} -w \${PWD}" - drr "${CI_REGISTRY_IMAGE}:temp-${CI_COMMIT_SHORT_SHA}" ansible --version - drr "${CI_REGISTRY_IMAGE}:temp-${CI_COMMIT_SHORT_SHA}" ansible -m ping localhost - drr "${CI_REGISTRY_IMAGE}:temp-${CI_COMMIT_SHORT_SHA}" ansible-lint --version diff --git a/Dockerfile b/Dockerfile index 935b92850d75cfc429c718c5321fc0bc52ba4501..8230fc38d5ef04084f772c68da4d042edbae6bdb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ FROM pipelinecomponents/ansible-lint:latest -ENV LANG C.UTF-8 -RUN apk add --no-cache git git-lfs openssh-client rsync - WORKDIR /opt/ansible + +RUN apk add --no-cache git git-lfs openssh-client rsync