diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f5d13ed308641ea9a36d1d1d5dcc1370c7b862f..053f757f7bc052d2b6f18808cb297a39ce885260 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ --- -image: docker:20.10.17 +image: docker:20.10.21 variables: DOCKER_TLS_CERTDIR: "/certs" @@ -12,10 +12,12 @@ build: stage: build script: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - docker build --pull --build-arg BUILDKIT_INLINE_CACHE=1 + - docker pull ghcr.io/ansible/creator-ee:v0.11.0 + - docker images + - docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - --tag $CI_REGISTRY_IMAGE:latest + --tag $CI_REGISTRY_IMAGE:creator-ee-test "." - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - - docker push $CI_REGISTRY_IMAGE:latest + - docker push $CI_REGISTRY_IMAGE:creator-ee-test diff --git a/Dockerfile b/Dockerfile index fabcafcf4dd08982f61412d023d3756ffa340ed6..1451e4ee185c5271e8d6724c8fa905d47cea064c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,10 @@ -FROM alpine:edge +FROM ghcr.io/ansible/creator-ee:v0.11.0 -RUN mkdir /app && apk add ansible-lint yamllint git py3-jsonschema +RUN mkdir /app + +RUN mkdir /bin/dumb-init +ADD lint.sh /bin/dumb-init/lint.sh WORKDIR /app -ENTRYPOINT ["/usr/bin/ansible-lint"] +ENTRYPOINT ["entrypoint"] diff --git a/lint.sh b/lint.sh new file mode 100644 index 0000000000000000000000000000000000000000..6dd128e06ebfff3382f6064451f0fc3254038fc3 --- /dev/null +++ b/lint.sh @@ -0,0 +1 @@ +ansible-lint