diff options
| author | Marcel Amirault <mamirault@gitlab.com> | 2023-03-14 04:50:32 +0300 |
|---|---|---|
| committer | Marcel Amirault <mamirault@gitlab.com> | 2023-03-14 04:50:32 +0300 |
| commit | be4c0047afa3d2cb456d1ff17f22638aa03ac5fa (patch) | |
| tree | e9d955e21ee92dc617663cbb22304ac2ce3d87f1 /.gitlab | |
| parent | ed1c454a010ea13c7e4325e178b5307d0fb4f78c (diff) | |
| parent | b14d426b2131410a503375d7e902f61f9746e2db (diff) | |
Merge branch 'eread/use-ruby-3_2_1-based-docker-image' into 'main'
Use Ruby 3.2.1-based Docker image
See merge request https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/3663
Merged-by: Marcel Amirault <mamirault@gitlab.com>
Approved-by: Marcel Amirault <mamirault@gitlab.com>
Co-authored-by: Evan Read <eread@gitlab.com>
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/test.gitlab-ci.yml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 0225fc01..7c1b0bea 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -3,7 +3,7 @@ ############################################### default: - image: registry.gitlab.com/gitlab-org/gitlab-docs/base:alpine-3.16-ruby-3.0.5-2a7e4d1c + image: registry.gitlab.com/gitlab-org/gitlab-docs/base:alpine-3.17-ruby-3.2.1-f53af000 tags: - gitlab-org diff --git a/.gitlab/ci/test.gitlab-ci.yml b/.gitlab/ci/test.gitlab-ci.yml index 89600960..c52d02c7 100644 --- a/.gitlab/ci/test.gitlab-ci.yml +++ b/.gitlab/ci/test.gitlab-ci.yml @@ -6,7 +6,7 @@ # Test the links in the global nav for all MRs in `gitlab-docs` # test_global_nav_links: - image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.16-ruby-3.0.5-2a7e4d1c + image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.17-ruby-3.2.1-f53af000 extends: - .rules_site_tests - .bundle @@ -181,7 +181,7 @@ test_EOL_whitespace: - .rules_chores - .bundle stage: test - image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.16-ruby-3.0.5-2a7e4d1c + image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.17-ruby-3.2.1-f53af000 needs: [] before_script: [] dependencies: [] @@ -198,7 +198,7 @@ test_unlinked_images: - .rules_chores - .bundle stage: test - image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.16-ruby-3.0.5-2a7e4d1c + image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.17-ruby-3.2.1-f53af000 needs: [] before_script: [] dependencies: [] |