mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-09 10:02:56 +01:00
Merge branch 'jerasmus-add-docs-image' into 'master'
Add image for gitlab-docs See merge request gitlab-org/gitlab-build-images!227
This commit is contained in:
commit
c72346c51d
1 changed files with 6 additions and 0 deletions
|
|
@ -73,6 +73,9 @@ ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker
|
||||||
# Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
|
# Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
|
||||||
ruby-2.6.3-git-2.22-chrome-74.0-node-12.x-yarn-1.16-docker-19.03.1 test: *test_custom
|
ruby-2.6.3-git-2.22-chrome-74.0-node-12.x-yarn-1.16-docker-19.03.1 test: *test_custom
|
||||||
|
|
||||||
|
# Used by gitlab-docs: https://gitlab.com/gitlab-org/gitlab-docs/blob/master/.gitlab-ci.yml
|
||||||
|
ruby-2.6.3-alpine-3.10-node-12.x-yarn-1.16 test: *test_custom
|
||||||
|
|
||||||
# Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
|
# Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
|
||||||
ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom
|
ruby-2.3-ansible-2.5.1-terraform-0.11 test: *test_custom
|
||||||
|
|
||||||
|
|
@ -122,6 +125,9 @@ ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker
|
||||||
# Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
|
# Used by www-gitlab-com's rspec job: https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/.gitlab-ci.yml
|
||||||
ruby-2.6.3-git-2.22-chrome-74.0-node-12.x-yarn-1.16-docker-19.03.1: *build_and_deploy_custom
|
ruby-2.6.3-git-2.22-chrome-74.0-node-12.x-yarn-1.16-docker-19.03.1: *build_and_deploy_custom
|
||||||
|
|
||||||
|
# Used by gitlab-docs: https://gitlab.com/gitlab-org/gitlab-docs/blob/master/.gitlab-ci.yml
|
||||||
|
ruby-2.6.3-alpine-3.10-node-12.x-yarn-1.16: *build_and_deploy_custom
|
||||||
|
|
||||||
# Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
|
# Used by https://gitlab.com/gitlab-org/distribution/gitlab-provisioner/
|
||||||
ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom
|
ruby-2.3-ansible-2.5.1-terraform-0.11: *build_and_deploy_custom
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue