summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-10-07 11:05:07 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-10-07 11:05:07 +0200
commit5f46c84d2289f92fc3c24c60e88e084be7318a69 (patch)
treeddd0894ac2a134f040cd104fb4019299caa29dea
parent466957aae45bdd5113d1630bcd113367c88cb125 (diff)
downloadgitlab-ce-doc/htmlproof.tar.gz
Fix duplicate image and bundle installdoc/htmlproof
-rw-r--r--.gitlab-ci.yml6
1 files changed, 2 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5a0751d8ed..766b30e1a3f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -296,15 +296,13 @@ lint-doc:
- scripts/lint-doc.sh
html-proof-docs:
- image: "phusion/passenger-ruby23"
stage: test
- image: registry.gitlab.com/gitlab-org/gitlab-build-images:doc-gitlab-com
+ image: "registry.gitlab.com/gitlab-org/gitlab-build-images:doc-gitlab-com"
variables:
PROGRESS: "1"
SITE_PATH: "/tmp/docs/"
before_script:
- - apt-get update
- - apt-get install -y pandoc
+ - bundle install --without postgres mysql production --jobs $(nproc) "${FLAGS[@]}" --retry=3
- scripts/generate-docs.rb
script:
- bundle exec htmlproofer ${SITE_PATH} --only-4xx