diff options
| -rw-r--r-- | .gitlab-ci.yml | 13 | ||||
| -rw-r--r-- | dockerfiles/Dockerfile.gitlab-docs-lint | 6 |
2 files changed, 15 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 839bf05e..fe053f6a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -403,11 +403,20 @@ image:docs-lint: - .docker_prepare stage: build-images variables: - IMAGE_NAME: $CI_REGISTRY_IMAGE:lint + VALE_VERSION: 2.3.3 + MARKDOWNLINT_VERSION: 0.23.2 + IMAGE_NAME: $CI_REGISTRY_IMAGE/lint:vale-$VALE_VERSION-markdownlint-$MARKDOWNLINT_VERSION + IMAGE_LATEST: $CI_REGISTRY_IMAGE/lint:latest DOCKERFILE: dockerfiles/Dockerfile.gitlab-docs-lint script: - - docker build --build-arg CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME} -t $IMAGE_NAME -f $DOCKERFILE . + - docker build + --build-arg CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME} + --build-arg VALE_VERSION=${VALE_VERSION} + --build-arg MARKDOWNLINT_VERSION=${MARKDOWNLINT_VERSION} + -t $IMAGE_NAME -f $DOCKERFILE . + - docker tag $IMAGE_NAME $IMAGE_LATEST - docker push $IMAGE_NAME + - docker push $IMAGE_LATEST environment: name: registry/docs-lint diff --git a/dockerfiles/Dockerfile.gitlab-docs-lint b/dockerfiles/Dockerfile.gitlab-docs-lint index 9f7dcfef..5ff65568 100644 --- a/dockerfiles/Dockerfile.gitlab-docs-lint +++ b/dockerfiles/Dockerfile.gitlab-docs-lint @@ -13,7 +13,9 @@ MAINTAINER GitLab Documentation Team # Install vale # We need to build it from source, see https://github.com/errata-ai/vale/issues/128 -ENV VALE_VERSION=2.3.3 +# VALE_VERSION and MARKDOWNLINT_VERSION are defined in .gitlab-ci.yml +ARG VALE_VERSION +ARG MARKDOWNLINT_VERSION ENV GOBIN=/usr/local/bin RUN apk add --no-cache wget zip tar make && \ @@ -38,7 +40,7 @@ ENV CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME:-master} WORKDIR /tmp # markdownlint-cli pinned to control when new versions are put in place. -RUN yarn global add markdownlint-cli@0.23.2 && yarn cache clean +RUN yarn global add markdownlint-cli@${MARKDOWNLINT_VERSION} && yarn cache clean RUN wget https://gitlab.com/gitlab-org/gitlab-docs/-/archive/$CI_COMMIT_REF_NAME/gitlab-docs-$CI_COMMIT_REF_NAME.tar.bz2 \ && tar xvjf gitlab-docs-$CI_COMMIT_REF_NAME.tar.bz2 \ |