summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-01-21 16:12:49 +0100
committerJames Lopez <james@jameslopez.es>2016-01-21 16:12:49 +0100
commit1c51fb1778e5e14f245f9e8d8a3531a4effc811f (patch)
tree5b3cbbcc11dc26158cee066c3e326a0d35fbaa93 /doc/ci
parent5ad60c5ddacc63ab1a0bc08a9e30557aa71b1f37 (diff)
downloadgitlab-ce-1c51fb1778e5e14f245f9e8d8a3531a4effc811f.tar.gz
update Ruby version to 2.2.4 (latest previous stable) and update docs
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md6
-rw-r--r--doc/ci/yaml/README.md2
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md b/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md
index e52e1547461..c1bb47e4291 100644
--- a/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md
+++ b/doc/ci/examples/test-and-deploy-ruby-application-to-heroku.md
@@ -56,12 +56,12 @@ gitlab-ci-multi-runner register \
--non-interactive \
--url "https://gitlab.com/ci/" \
--registration-token "PROJECT_REGISTRATION_TOKEN" \
- --description "ruby-2.1" \
+ --description "ruby-2.2" \
--executor "docker" \
- --docker-image ruby:2.1 \
+ --docker-image ruby:2.2 \
--docker-postgres latest
```
-With the command above, you create a runner that uses [ruby:2.1](https://registry.hub.docker.com/u/library/ruby/) image and uses [postgres](https://registry.hub.docker.com/u/library/postgres/) database.
+With the command above, you create a runner that uses [ruby:2.2](https://registry.hub.docker.com/u/library/ruby/) image and uses [postgres](https://registry.hub.docker.com/u/library/postgres/) database.
To access PostgreSQL database you need to connect to `host: postgres` as user `postgres` without password.
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index fd0d49de4e4..779b9db6486 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -33,7 +33,7 @@ The YAML syntax allows for using more complex job specifications than in the
above example:
```yaml
-image: ruby:2.1
+image: ruby:2.2
services:
- postgres