diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-05-17 20:47:14 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-05-17 20:47:14 +0300 |
| commit | d0a1a9f13a67dab4ce93a41242329fa56c531e75 (patch) | |
| tree | 6a3b8cad833da3390967336a3e12089e0bf18676 | |
| parent | 30f769f3b484a30bf46307f2cb61e104bca4350c (diff) | |
| parent | b865af22894aa28e1afba14b9a72627a9f7cacc8 (diff) | |
Merge branch 'docs-environments-review-2' into 'master'
Docs: Follow-Up on Environments doc review
Closes #61085
See merge request gitlab-org/gitlab-ce!27788
| -rw-r--r-- | doc/ci/environments.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ci/environments.md b/doc/ci/environments.md index d5e6fbe8113..5a14ac17aec 100644 --- a/doc/ci/environments.md +++ b/doc/ci/environments.md @@ -268,7 +268,7 @@ For the value of: which receives the value of the branch name. - `environment:url`, we want a specific and distinct URL for each branch. `$CI_COMMIT_REF_NAME` may contain a `/` or other characters that would be invalid in a domain name or URL, - so we use `$CI_ENVIRONMENT_SLUG` to get a "clean" or "safe" URL. + so we use `$CI_ENVIRONMENT_SLUG` to guarantee that we get a valid URL. For example, given a `$CI_COMMIT_REF_NAME` of `100-Do-The-Thing`, the URL will be something like `https://100-do-the-4f99a2.example.com`. Again, the way you set up @@ -351,7 +351,7 @@ deploy_prod: ``` A more realistic example would also include copying files to a location where a -webserver (for example, NGINX) could then acess and serve them. +webserver (for example, NGINX) could then access and serve them. The example below will copy the `public` directory to `/srv/nginx/$CI_COMMIT_REF_SLUG/public`: |