diff options
author | Rémy Coutable <remy@rymai.me> | 2017-01-30 14:03:01 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-01-30 14:03:01 +0300 |
commit | 067ce273a592abbcc7d9e417a5466ba113882dca (patch) | |
tree | c3cbe29e980a86192bbc9967b6f06d0e63d5d0a1 /doc | |
parent | b604c93cd6cdfa64b12792503391be71e60a5383 (diff) | |
parent | 5d69ea265ed5569c542ac34038f6d9701584e64e (diff) |
Merge branch 'patch-11' into 'master'
Fix the documentation to use the correct variable in a code example
See merge request !8585
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ci/environments.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/ci/environments.md b/doc/ci/environments.md index 98cd29c9567..ef04c537367 100644 --- a/doc/ci/environments.md +++ b/doc/ci/environments.md @@ -297,7 +297,7 @@ deploy_review: - echo "Deploy a review app" environment: name: review/$CI_BUILD_REF_NAME - url: https://$CI_BUILD_REF_SLUG.review.example.com + url: https://$CI_ENVIRONMENT_SLUG.example.com only: - branches except: @@ -318,15 +318,15 @@ also contain `/`, or other characters that would be invalid in a domain name or URL, we use `$CI_ENVIRONMENT_SLUG` in the `environment:url` so that the environment can get a specific and distinct URL for each branch. In this case, given a `$CI_BUILD_REF_NAME` of `100-Do-The-Thing`, the URL will be something -like `https://review-100-do-the-4f99a2.example.com`. Again, the way you set up +like `https://100-do-the-4f99a2.example.com`. Again, the way you set up the web server to serve these requests is based on your setup. You could also use `$CI_BUILD_REF_SLUG` in `environment:url`, e.g.: -`https://$CI_BUILD_REF_SLUG.review.example.com`. We use `$CI_ENVIRONMENT_SLUG` +`https://$CI_BUILD_REF_SLUG.example.com`. We use `$CI_ENVIRONMENT_SLUG` here because it is guaranteed to be unique, but if you're using a workflow like [GitLab Flow][gitlab-flow], collisions are very unlikely, and you may prefer environment names to be more closely based on the branch name - the example -above would give you an URL like `https://100-do-the-thing.review.example.com` +above would give you an URL like `https://100-do-the-thing.example.com` Last but not least, we tell the job to run [`only`][only] on branches [`except`][only] master. |