Commit 21aadb30 authored by Craig Norris's avatar Craig Norris

Merge branch 'eread/update-linting-images-for-project' into 'master'

Updating documentation linting images for project

See merge request gitlab-org/gitlab!78427
parents e09ca771 44fa2372
...@@ -44,7 +44,7 @@ docs-lint markdown: ...@@ -44,7 +44,7 @@ docs-lint markdown:
- .default-retry - .default-retry
- .docs:rules:docs-lint - .docs:rules:docs-lint
# When updating the image version here, update it in /scripts/lint-doc.sh too. # When updating the image version here, update it in /scripts/lint-doc.sh too.
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.14-vale-2.12.0-markdownlint-0.29.0 image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.15-vale-2.14.0-markdownlint-0.30.0
stage: lint stage: lint
needs: [] needs: []
script: script:
...@@ -53,7 +53,7 @@ docs-lint markdown: ...@@ -53,7 +53,7 @@ docs-lint markdown:
docs-lint links: docs-lint links:
extends: extends:
- .docs:rules:docs-lint - .docs:rules:docs-lint
image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.14-ruby-2.7.5-08847baa image: registry.gitlab.com/gitlab-org/gitlab-docs/lint-html:alpine-3.15-ruby-2.7.5-cee62c13
stage: lint stage: lint
needs: [] needs: []
script: script:
......
...@@ -112,10 +112,9 @@ bundle exec rake gitlab:features:disable_rugged ...@@ -112,10 +112,9 @@ bundle exec rake gitlab:features:disable_rugged
Most of this code exists in the `lib/gitlab/git/rugged_impl` directory. Most of this code exists in the `lib/gitlab/git/rugged_impl` directory.
NOTE: NOTE:
You should *not* need to add or modify code related to You should *not* have to add or modify code related to Rugged unless explicitly discussed with the
Rugged unless explicitly discussed with the [Gitaly Team](https://gitlab.com/groups/gl-gitaly/group_members). This code does not work on GitLab.com or other GitLab
[Gitaly Team](https://gitlab.com/groups/gl-gitaly/group_members). This code does instances that do not use NFS.
NOT work on GitLab.com or other GitLab instances that do not use NFS.
## `TooManyInvocationsError` errors ## `TooManyInvocationsError` errors
...@@ -197,7 +196,7 @@ If you make changes to your local Gitaly in between test runs you need ...@@ -197,7 +196,7 @@ If you make changes to your local Gitaly in between test runs you need
to manually run `make` again. to manually run `make` again.
Note that CI tests do not use your locally modified version of Note that CI tests do not use your locally modified version of
Gitaly. To use a custom Gitaly version in CI you need to update Gitaly. To use a custom Gitaly version in CI, you must update
GITALY_SERVER_VERSION as described at the beginning of this section. GITALY_SERVER_VERSION as described at the beginning of this section.
To use a different Gitaly repository, such as if your changes are present To use a different Gitaly repository, such as if your changes are present
...@@ -326,7 +325,7 @@ default value. The default value depends on the GitLab version. ...@@ -326,7 +325,7 @@ default value. The default value depends on the GitLab version.
To be sure that the flag is set correctly and it goes into Gitaly, you can check To be sure that the flag is set correctly and it goes into Gitaly, you can check
the integration by using GDK: the integration by using GDK:
1. The state of the flag must be observable. To check it, you need to enable it 1. The state of the flag must be observable. To check it, you must enable it
by fetching the Prometheus metrics: by fetching the Prometheus metrics:
1. Navigate to GDK's root directory. 1. Navigate to GDK's root directory.
1. Make sure you have the proper branch checked out for Gitaly. 1. Make sure you have the proper branch checked out for Gitaly.
......
...@@ -128,7 +128,7 @@ function run_locally_or_in_docker() { ...@@ -128,7 +128,7 @@ function run_locally_or_in_docker() {
$cmd $args $cmd $args
elif hash docker 2>/dev/null elif hash docker 2>/dev/null
then then
docker run -t -v ${PWD}:/gitlab -w /gitlab --rm registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.14-vale-2.12.0-markdownlint-0.29.0 ${cmd} ${args} docker run -t -v ${PWD}:/gitlab -w /gitlab --rm registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.15-vale-2.14.0-markdownlint-0.30.0 ${cmd} ${args}
else else
echo echo
echo " ✖ ERROR: '${cmd}' not found. Install '${cmd}' or Docker to proceed." >&2 echo " ✖ ERROR: '${cmd}' not found. Install '${cmd}' or Docker to proceed." >&2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment