Commit 119b9df1 authored by Evan Read's avatar Evan Read

Merge branch 'update-docs-script-image' into 'master'

Update docs script image

See merge request gitlab-org/gitlab!47869
parents cf5e878a 92fb880d
...@@ -42,6 +42,7 @@ docs-lint markdown: ...@@ -42,6 +42,7 @@ docs-lint markdown:
extends: extends:
- .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.
image: "registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.12-vale-2.6.1-markdownlint-0.24.0" image: "registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.12-vale-2.6.1-markdownlint-0.24.0"
stage: test stage: test
needs: [] needs: []
......
...@@ -249,7 +249,7 @@ pipeline to include running the tests along with the existing build job. ...@@ -249,7 +249,7 @@ pipeline to include running the tests along with the existing build job.
## Continuous Integration ## Continuous Integration
To ensure our changes don't break the build and all tests still pass, we utilize To ensure our changes don't break the build and all tests still pass, we use
Continuous Integration (CI) to run these checks automatically for every push. Continuous Integration (CI) to run these checks automatically for every push.
Read through this article to understand [Continuous Integration, Continuous Delivery, and Continuous Deployment](https://about.gitlab.com/blog/2016/08/05/continuous-integration-delivery-and-deployment-with-gitlab/), Read through this article to understand [Continuous Integration, Continuous Delivery, and Continuous Deployment](https://about.gitlab.com/blog/2016/08/05/continuous-integration-delivery-and-deployment-with-gitlab/),
and how these methods are leveraged by GitLab. and how these methods are leveraged by GitLab.
......
...@@ -17,7 +17,7 @@ You can configure your job to use custom Metrics Reports, and GitLab will displa ...@@ -17,7 +17,7 @@ You can configure your job to use custom Metrics Reports, and GitLab will displa
## Use cases ## Use cases
Consider the following examples of data that can utilize Metrics Reports: Consider the following examples of data that can use Metrics Reports:
1. Memory usage 1. Memory usage
1. Load testing results 1. Load testing results
......
...@@ -81,7 +81,7 @@ function run_locally_or_in_docker() { ...@@ -81,7 +81,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:latest ${cmd} ${args} docker run -t -v ${PWD}:/gitlab -w /gitlab --rm registry.gitlab.com/gitlab-org/gitlab-docs/lint-markdown:alpine-3.12-vale-2.6.1-markdownlint-0.24.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