Commit 06638397 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'change-url-in-specific-runners-registration-steps' into 'master'

Remove references to '/ci' path while describing Runner's registration

See merge request !10518
parents b46b52af cd063101
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
(checkout the #{link_to 'GitLab Runner section', 'https://about.gitlab.com/gitlab-ci/#gitlab-runner', target: '_blank'} for information on how to install it). (checkout the #{link_to 'GitLab Runner section', 'https://about.gitlab.com/gitlab-ci/#gitlab-runner', target: '_blank'} for information on how to install it).
%li %li
Specify the following URL during the Runner setup: Specify the following URL during the Runner setup:
%code= ci_root_url(only_path: false) %code= root_url(only_path: false)
%li %li
Use the following registration token during setup: Use the following registration token during setup:
%code= @project.runners_token %code= @project.runners_token
......
...@@ -37,7 +37,7 @@ GitLab Runner then executes job scripts as the `gitlab-runner` user. ...@@ -37,7 +37,7 @@ GitLab Runner then executes job scripts as the `gitlab-runner` user.
```bash ```bash
sudo gitlab-ci-multi-runner register -n \ sudo gitlab-ci-multi-runner register -n \
--url https://gitlab.com/ci \ --url https://gitlab.com/ \
--registration-token REGISTRATION_TOKEN \ --registration-token REGISTRATION_TOKEN \
--executor shell \ --executor shell \
--description "My Runner" --description "My Runner"
...@@ -94,7 +94,7 @@ In order to do that, follow the steps: ...@@ -94,7 +94,7 @@ In order to do that, follow the steps:
```bash ```bash
sudo gitlab-ci-multi-runner register -n \ sudo gitlab-ci-multi-runner register -n \
--url https://gitlab.com/ci \ --url https://gitlab.com/ \
--registration-token REGISTRATION_TOKEN \ --registration-token REGISTRATION_TOKEN \
--executor docker \ --executor docker \
--description "My Docker Runner" \ --description "My Docker Runner" \
...@@ -112,7 +112,7 @@ In order to do that, follow the steps: ...@@ -112,7 +112,7 @@ In order to do that, follow the steps:
``` ```
[[runners]] [[runners]]
url = "https://gitlab.com/ci" url = "https://gitlab.com/"
token = TOKEN token = TOKEN
executor = "docker" executor = "docker"
[runners.docker] [runners.docker]
...@@ -179,7 +179,7 @@ In order to do that, follow the steps: ...@@ -179,7 +179,7 @@ In order to do that, follow the steps:
```bash ```bash
sudo gitlab-ci-multi-runner register -n \ sudo gitlab-ci-multi-runner register -n \
--url https://gitlab.com/ci \ --url https://gitlab.com/ \
--registration-token REGISTRATION_TOKEN \ --registration-token REGISTRATION_TOKEN \
--executor docker \ --executor docker \
--description "My Docker Runner" \ --description "My Docker Runner" \
...@@ -197,7 +197,7 @@ In order to do that, follow the steps: ...@@ -197,7 +197,7 @@ In order to do that, follow the steps:
``` ```
[[runners]] [[runners]]
url = "https://gitlab.com/ci" url = "https://gitlab.com/"
token = REGISTRATION_TOKEN token = REGISTRATION_TOKEN
executor = "docker" executor = "docker"
[runners.docker] [runners.docker]
......
...@@ -55,11 +55,11 @@ You can do this through the [Dashboard](https://dashboard.heroku.com/). ...@@ -55,11 +55,11 @@ You can do this through the [Dashboard](https://dashboard.heroku.com/).
### Create runner ### Create runner
First install [Docker Engine](https://docs.docker.com/installation/). First install [Docker Engine](https://docs.docker.com/installation/).
To build this project you also need to have [GitLab Runner](https://about.gitlab.com/gitlab-ci/#gitlab-runner). To build this project you also need to have [GitLab Runner](https://about.gitlab.com/gitlab-ci/#gitlab-runner).
You can use public runners available on `gitlab.com/ci`, but you can register your own: You can use public runners available on `gitlab.com`, but you can register your own:
``` ```
gitlab-ci-multi-runner register \ gitlab-ci-multi-runner register \
--non-interactive \ --non-interactive \
--url "https://gitlab.com/ci/" \ --url "https://gitlab.com/" \
--registration-token "PROJECT_REGISTRATION_TOKEN" \ --registration-token "PROJECT_REGISTRATION_TOKEN" \
--description "python-3.5" \ --description "python-3.5" \
--executor "docker" \ --executor "docker" \
......
...@@ -50,11 +50,11 @@ You can do this through the [Dashboard](https://dashboard.heroku.com/). ...@@ -50,11 +50,11 @@ You can do this through the [Dashboard](https://dashboard.heroku.com/).
### Create runner ### Create runner
First install [Docker Engine](https://docs.docker.com/installation/). First install [Docker Engine](https://docs.docker.com/installation/).
To build this project you also need to have [GitLab Runner](https://about.gitlab.com/gitlab-ci/#gitlab-runner). To build this project you also need to have [GitLab Runner](https://about.gitlab.com/gitlab-ci/#gitlab-runner).
You can use public runners available on `gitlab.com/ci`, but you can register your own: You can use public runners available on `gitlab.com`, but you can register your own:
``` ```
gitlab-ci-multi-runner register \ gitlab-ci-multi-runner register \
--non-interactive \ --non-interactive \
--url "https://gitlab.com/ci/" \ --url "https://gitlab.com/" \
--registration-token "PROJECT_REGISTRATION_TOKEN" \ --registration-token "PROJECT_REGISTRATION_TOKEN" \
--description "ruby-2.2" \ --description "ruby-2.2" \
--executor "docker" \ --executor "docker" \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment