diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-10-22 07:40:17 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-10-22 07:40:17 +0000 |
commit | 46e66f5845d14f086400d201c1855abe70f337f8 (patch) | |
tree | 081246927d9ae149cba5517fc2bfe5248a2dc962 | |
parent | ada2d23116a93858569e74bf6402e0d0e515d6e4 (diff) | |
parent | 38a93a25f394283d36d5d4e2f4bc5166a6dfbedd (diff) | |
download | gitlab-ce-46e66f5845d14f086400d201c1855abe70f337f8.tar.gz |
Merge branch '3147-gitlab-ci-yml-variables-adjust-docs' into 'master'
Fixed suggestion in documentation resulting in linting error 'variables should be a map of key-valued strings'
Documentation now suggests a valid option with the intended result.
See #3147
`"yes"`, opposed to `yes` is not casted to a boolean. `variables` only accepts key-valued strings.
Better solution would be to change the parsing of `variables` (allow boolean or check the actual value of the string).
See merge request !1660
-rw-r--r-- | doc/ci/docker/using_docker_images.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md index 191e3a8144d..ef8a7ec1e86 100644 --- a/doc/ci/docker/using_docker_images.md +++ b/doc/ci/docker/using_docker_images.md @@ -90,7 +90,7 @@ you need to set MYSQL_ALLOW_EMPTY_PASSWORD. - mysql variables: - MYSQL_ALLOW_EMPTY_PASSWORD: yes + MYSQL_ALLOW_EMPTY_PASSWORD: "yes" ``` For other possible configuration variables check the |