summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-10-04 16:07:26 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-10-04 16:07:26 +0000
commitfc4112077e9fa71a4c6094f761df824a205f2396 (patch)
tree7fb4b892c7ff49202867f8b9a09f742d68b1b07e
parentd2c631285ccb3b8fa244f359a27039dea15fe593 (diff)
parent476c44ae5e1a9fd50bd867dc38fdf0d9d42a9f44 (diff)
downloadgitlab-ce-fc4112077e9fa71a4c6094f761df824a205f2396.tar.gz
Merge branch 'new-docs-linting-image' into 'master'
Change image for docs linting See merge request gitlab-org/gitlab-ce!22100
-rw-r--r--.gitlab-ci.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a299ea79ef..c652b6c75e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -606,7 +606,7 @@ static-analysis:
docs lint:
<<: *dedicated-runner
<<: *except-qa
- image: "registry.gitlab.com/gitlab-org/gitlab-build-images:nanoc-bootstrap-ruby-2.4-alpine"
+ image: "registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-docs-lint"
stage: test
cache: {}
dependencies: []
@@ -614,8 +614,8 @@ docs lint:
script:
- scripts/lint-doc.sh
- scripts/lint-changelog-yaml
- - mv doc/ /nanoc/content/
- - cd /nanoc
+ - mv doc/ /tmp/gitlab-docs/content/
+ - cd /tmp/gitlab-docs
# Build HTML from Markdown
- bundle exec nanoc
# Check the internal links