diff options
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | dockerfiles/Dockerfile.gitlab-docs-lint | 34 |
2 files changed, 41 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79972d06..8fb02d64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -416,16 +416,20 @@ image:docs-lint: - .docker_prepare stage: build-images variables: - VALE_VERSION: 2.4.0 - MARKDOWNLINT_VERSION: 0.23.2 - IMAGE_NAME: $CI_REGISTRY_IMAGE/lint:vale-$VALE_VERSION-markdownlint-$MARKDOWNLINT_VERSION + RUBY_VERSION: '2.6.6' + ALPINE_VERSION: '3.12' + VALE_VERSION: '2.4.3' + MARKDOWNLINT_VERSION: '0.24.0' + IMAGE_NAME: $CI_REGISTRY_IMAGE/lint:ruby-$RUBY_VERSION-alpine-$ALPINE_VERSION-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} + --build-arg RUBY_VERSION=${RUBY_VERSION} + --build-arg ALPINE_VERSION=${ALPINE_VERSION} --build-arg VALE_VERSION=${VALE_VERSION} --build-arg MARKDOWNLINT_VERSION=${MARKDOWNLINT_VERSION} + --build-arg CI_COMMIT_REF_NAME=${CI_COMMIT_REF_NAME} -t $IMAGE_NAME -f $DOCKERFILE . - docker tag $IMAGE_NAME $IMAGE_LATEST - docker push $IMAGE_NAME diff --git a/dockerfiles/Dockerfile.gitlab-docs-lint b/dockerfiles/Dockerfile.gitlab-docs-lint index 252d28bd..d3b3ee59 100644 --- a/dockerfiles/Dockerfile.gitlab-docs-lint +++ b/dockerfiles/Dockerfile.gitlab-docs-lint @@ -7,7 +7,11 @@ # ############################ -FROM registry.gitlab.com/gitlab-org/gitlab-docs:base +# RUBY_VERSION and ALPINE_VERSION are defined in .gitlab-ci.yml +ARG RUBY_VERSION +ARG ALPINE_VERSION + +FROM ruby:${RUBY_VERSION}-alpine${ALPINE_VERSION} MAINTAINER GitLab Technical Writing team # VALE_VERSION and MARKDOWNLINT_VERSION are defined in .gitlab-ci.yml @@ -15,6 +19,34 @@ ARG VALE_VERSION ARG MARKDOWNLINT_VERSION ENV GOBIN=/usr/local/bin +# Install dependencies +RUN apk add --no-cache -U \ + bash \ + build-base \ + curl \ + git \ + gnupg \ + gzip \ + grep \ + libcurl \ + libxslt \ + libxslt-dev \ + nodejs \ + openssl \ + pngquant \ + ruby-dev \ + tar \ + xz \ + xz-dev \ + go \ + yarn + +# Do not install rdoc to save some space +RUN echo 'gem: --no-document' >> /etc/gemrc + +# Update bundler +RUN gem install bundler -v "1.17.3" + # Install vale RUN curl -L https://github.com/errata-ai/vale/archive/v${VALE_VERSION}.tar.gz -o v${VALE_VERSION}.tar.gz && \ tar -xvzf v${VALE_VERSION}.tar.gz && \ |