diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-06-18 10:32:01 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-06-18 10:32:01 +0000 |
| commit | 8df34927d36de36e49c16a7db22b64e54842fdc3 (patch) | |
| tree | f2636f94efbe94e7e85e661084511ff62732bfaf | |
| parent | 4a51d505b0350e6b72baf1e2812ca0bad4986ca7 (diff) | |
| parent | 8169aa3d07335569cf7947d3449ea67024e6295f (diff) | |
| download | gitlab-ci-8df34927d36de36e49c16a7db22b64e54842fdc3.tar.gz | |
Merge branch 'doc_examples' into 'master'
Update documantation
See merge request !147
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | doc/examples/README.md | 20 | ||||
| -rw-r--r-- | doc/examples/configure/ruby.md | 7 |
3 files changed, 20 insertions, 8 deletions
@@ -14,6 +14,7 @@ v7.12.0 - Updated rails to 4.1.11 - API fix: project create call - Link to web-editor with .gitlab-ci.yml + - Updated examples in the documentation v7.11.0 - Deploy Jobs API calls diff --git a/doc/examples/README.md b/doc/examples/README.md index 1e11a7e..444d68b 100644 --- a/doc/examples/README.md +++ b/doc/examples/README.md @@ -13,10 +13,22 @@ The runner runs the line below before it runs the commands in your build script: # Environmental variables -The build command is run from [GitlabCi::Build#command](https://gitlab.com/gitlab-org/gitlab-ci-runner/blob/master/lib/build.rb#L96) and contains the following environmental variables: - - CI_SERVER, CI_SERVER_NAME, CI_SERVER_VERSION, CI_SERVER_REVISION - CI_BUILD_REF, CI_BUILD_BEFORE_SHA, CI_BUILD_REF_NAME (branch), CI_BUILD_ID +The runner sets the following environmental variables: + +``` +CI=true +CI_SERVER=true +CI_SERVER_NAME=GitLab CI +GITLAB_CI=true +CI_SERVER_VERSION +CI_SERVER_REVISION +CI_BUILD_REF +CI_BUILD_BEFORE_SHA +CI_BUILD_REF_NAME (branch) +CI_BUILD_ID +CI_BUILD_REPO +CI_PROJECT_DIR +``` # Build script examples diff --git a/doc/examples/configure/ruby.md b/doc/examples/configure/ruby.md index 466e87e..3ecdaac 100644 --- a/doc/examples/configure/ruby.md +++ b/doc/examples/configure/ruby.md @@ -18,9 +18,8 @@ curl -L https://www.chef.io/chef/install.sh | bash chef-client -z -r 'recipe[cookbook-gitlab-test::ruby], recipe[cookbook-gitlab-test::mysql]' ) + ### Register your runner instance with a GitLab CI Coordinator -sudo /opt/gitlab-runner/bin/setup -C /home/gitlab-runner +gitlab-ci-multi-runner register -# Restart the gitlab-runner Upstart script -sudo service gitlab-runner restart -``` +```
\ No newline at end of file |