Merge branch 'doc_examples' into 'master'

Update documantation See merge request !147
gitlabhq · Jun 18, 2015 · 8df3492 · 8df3492
2 parents 4a51d50 + 8169aa3
commit 8df3492
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -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
@@ -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
@@ -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
-```
+```