diff options
| author | Evan Read <eread@gitlab.com> | 2022-05-25 04:01:41 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2022-05-25 06:56:58 +0300 |
| commit | 66d42aa886b350e70bd54bcb56d693d348e5d606 (patch) | |
| tree | cda833e7de0bbc83d40c3a7c85a8e99d149076c6 | |
| parent | 672b7a64240093e794a32a21d09a1a77cbb0baa9 (diff) | |
Test changes to GitLab Docs base Docker imageeread/test-changes-gitlab-docs-base-docker-image
| -rw-r--r-- | .gitlab-ci.yml | 15 | ||||
| -rw-r--r-- | dockerfiles/gitlab-docs-base.Dockerfile | 15 |
2 files changed, 23 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c256e766..83ff9d78 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -619,7 +619,7 @@ image:docs-lint-html: name: registry/docs-lint-html # -# GitLab docs image +# Build and deploy the GitLab docs base Docker image # image:gitlab-docs-base: extends: @@ -636,6 +636,19 @@ image:gitlab-docs-base: name: registry/docs-base # +# Test the GitLab docs base Docker image if changes made to its Dockerfile +# +test:image:gitlab-docs-base: + extends: + - .docker_prepare + stage: test + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + changes: + - dockerfiles/gitlab-docs-base.Dockerfile + script: docker build -f dockerfiles/gitlab-docs-base.Dockerfile . + +# # Helper Docker image containing all build dependencies. # It must be rebuilt every time Gemfile and/or Gemfile.lock changes. # diff --git a/dockerfiles/gitlab-docs-base.Dockerfile b/dockerfiles/gitlab-docs-base.Dockerfile index 03009370..ca9bcf89 100644 --- a/dockerfiles/gitlab-docs-base.Dockerfile +++ b/dockerfiles/gitlab-docs-base.Dockerfile @@ -1,11 +1,8 @@ -# -# Image that contains all Nanoc dependencies and tools that -# are needed to build the docs site and run the tests. -# +# Base image for other Docker images FROM ruby:2.7.5-alpine3.15 # Install dependencies -RUN apk add --no-cache -U \ +RUN printf "\n\e[32mINFO: Installing dependencies..\e[39m\n" && apk add --no-cache -U \ bash \ build-base \ curl \ @@ -27,4 +24,10 @@ RUN apk add --no-cache -U \ xz-dev \ yarn \ && echo 'gem: --no-document' >> /etc/gemrc \ - && gem update --system 3.3.13 + && gem update --silent --system 3.3.13 \ + && printf "\n\e[32mINFO: Dependency versions:\e[39m\n" \ + && echo "Ruby: $(ruby --version)" \ + && echo "RubyGems: $(gem --version)" \ + && echo "Node.js: $(node --version)" \ + && echo "Yarn: $(yarn --version)" \ + && printf "\n" |