diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-04-27 14:50:15 +0000 |
|---|---|---|
| committer | Marcia Ramos <virtua.creative@gmail.com> | 2018-04-27 14:50:15 +0000 |
| commit | 66a78bb609076610bb99a5074fcacfa7394a1845 (patch) | |
| tree | c84770e46a8672d4feb25bc14111126851b9f004 | |
| parent | 4377f453bfc98705d5e478beaf3632235899a311 (diff) | |
| download | gitlab-ce-66a78bb609076610bb99a5074fcacfa7394a1845.tar.gz | |
Resolve "Add how to use nip.io to Auto DevOps and Kubernetes documentation"
| -rw-r--r-- | app/views/projects/settings/ci_cd/_autodevops_form.html.haml | 1 | ||||
| -rw-r--r-- | doc/topics/autodevops/index.md | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml index 7b410101c05..71e77dae69e 100644 --- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml +++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml @@ -36,5 +36,6 @@ = form.text_field :domain, class: 'form-control', placeholder: 'domain.com' .help-block = s_('CICD|You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages.') + = link_to icon('question-circle'), help_page_path('topics/autodevops/index.md', anchor: 'auto-devops-base-domain'), target: '_blank' = f.submit 'Save changes', class: "btn btn-success prepend-top-15" diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 8c4a2925356..7c0cd2c40d2 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -135,6 +135,11 @@ and `1.2.3.4` is the IP address of your load balancer; generally NGINX ([see prerequisites](#prerequisites)). How to set up the DNS record is beyond the scope of this document; you should check with your DNS provider. +Alternatively you can use free public services like [xip.io](http://xip.io) or +[nip.io](http://nip.io) which provide automatic wildcard DNS without any +configuration. Just set the Auto DevOps base domain to `1.2.3.4.xip.io` or +`1.2.3.4.nip.io`. + Once set up, all requests will hit the load balancer, which in turn will route them to the Kubernetes pods that run your application(s). |