summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2014-12-05 14:14:29 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2014-12-05 14:14:29 +0000
commitb69f246f28ca2af41c33a9f39542470daa96dfe2 (patch)
treebc612b61ba328601f4372366e2d21190c309b33d
parent76b6e1f30544289953e292ff442d6c35aeeff999 (diff)
parent22e656d9f9b8d4bd29e191446201faaa429dc755 (diff)
downloadgitlab-ci-b69f246f28ca2af41c33a9f39542470daa96dfe2.tar.gz
Merge branch 'refer-people-to-omnibus-installation' into 'master'
Refer people to omnibus installation Ooops for missing this so long. /cc @jacobvosmaer @job See merge request !94
-rw-r--r--README.md13
1 files changed, 7 insertions, 6 deletions
diff --git a/README.md b/README.md
index 3358099..9222695 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,13 @@ The following features are not yet in GitLab CI but merge requests are very welc
* [Build artifacts access](http://feedback.gitlab.com/forums/176466-general/suggestions/4522830-allow-access-to-build-artifacts-of-gitlab-ci)
* For parallel builds, deployments, branch specific builds and build metrics there is a [blog article with implementation steps](http://blog.gitlab.org/gitlab-ci-with-parallel-builds-and-deployments/)
+### Installation
+
+* [Omnibus packages](https://about.gitlab.com/downloads/) (recommended) now include the CI coordinator, see the [configuration instructions](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/gitlab-ci/README.md)
+* [Installation guide](doc/install/installation.md)
+* [Unofficial Docker Image by Sameer Naik](https://github.com/sameersbn/docker-gitlab-ci)
+* [Unofficial Docker Image by Anastas Dancha](https://registry.hub.docker.com/u/anapsix/gitlab-ci/) is available via `docker pull anapsix/gitlab-ci`
+
### Runners
To perform the actual build you need a CI runner (also see the Architecture section below):
@@ -76,12 +83,6 @@ For more information see:
and
[Integrating GitLab CI With GitLab to Enable Distributed Builds](http://blog.gitlab.org/integrating-gitlab-ci-with-gitlab/)
-### Installation
-
-* [Installation guide](doc/install/installation.md)
-* [Unofficial Docker Image by Sameer Naik](https://github.com/sameersbn/docker-gitlab-ci)
-* [Unofficial Docker Image by Anastas Dancha](https://registry.hub.docker.com/u/anapsix/gitlab-ci/) is available via `docker pull anapsix/gitlab-ci`
-
### How to add a new project to GitLab CI
1. Log in the GitLab CI web interface