summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-07-02 13:19:49 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-07-06 16:43:16 +0200
commit321df0ce4bfd4e888b287e9bb44394451390407f (patch)
tree92dbdb9f259e709933b7ed9f993bb7c47fe3c8a5 /doc
parent845da9ef78025a5d5a5e4a9a7991daa121ee4faf (diff)
downloadgitlab-ci-321df0ce4bfd4e888b287e9bb44394451390407f.tar.gz
Split long lines
Diffstat (limited to 'doc')
-rw-r--r--doc/deployment/README.md18
-rw-r--r--doc/examples/test-and-deploy-python-application-to-heroku.md7
-rw-r--r--doc/examples/test-and-deploy-ruby-application-to-heroku.md11
3 files changed, 25 insertions, 11 deletions
diff --git a/doc/deployment/README.md b/doc/deployment/README.md
index 199ad9d..ffd841c 100644
--- a/doc/deployment/README.md
+++ b/doc/deployment/README.md
@@ -20,9 +20,11 @@ apt-get update
apt-get install ruby-dev
```
-The Dpl provides support for vast number of services, including: Heroku, Cloud Foundry, AWS/S3, and more. To use it simply define provider and any additional parameters required by the provider.
+The Dpl provides support for vast number of services, including: Heroku, Cloud Foundry, AWS/S3, and more.
+To use it simply define provider and any additional parameters required by the provider.
-For example if you want to use it to deploy your application to heroku, you need to specify `heroku` as provider, specify `api-key` and `app`. There's more and all possible parameters can be found here: https://github.com/travis-ci/dpl#heroku
+For example if you want to use it to deploy your application to heroku, you need to specify `heroku` as provider, specify `api-key` and `app`.
+There's more and all possible parameters can be found here: https://github.com/travis-ci/dpl#heroku
```
staging:
@@ -36,7 +38,10 @@ In the above example we use Dpl to deploy `my-app-staging` to Heroku server with
To use different provider take a look at long list of [Supported Providers](https://github.com/travis-ci/dpl#supported-providers).
### Using Dpl with Docker
-When you use GitLab Runner you most likely configured it to use your server's shell commands. This means that all commands are run in context of local user (ie. gitlab_runner or gitlab_ci_multi_runner). It also means that most probably in your Docker container you don't have the Ruby runtime installed. You will have to install it:
+When you use GitLab Runner you most likely configured it to use your server's shell commands.
+This means that all commands are run in context of local user (ie. gitlab_runner or gitlab_ci_multi_runner).
+It also means that most probably in your Docker container you don't have the Ruby runtime installed.
+You will have to install it:
```
staging:
type: deploy
@@ -48,10 +53,13 @@ staging:
- master
```
-The first line `apt-get update -yq` updates the list of available packages, where second `apt-get install -y ruby-dev` install `Ruby` runtime on system. The above example is valid for all Debian-compatible systems.
+The first line `apt-get update -yq` updates the list of available packages, where second `apt-get install -y ruby-dev` install `Ruby` runtime on system.
+The above example is valid for all Debian-compatible systems.
### Usage in staging and production
-It's pretty common in developer workflow to have staging (development) and production environment. If we consider above example: we would like to deploy `master` branch to `staging` and `all tags` to `production` environment. The final `.gitlab-ci.yml` for that setup would look like this:
+It's pretty common in developer workflow to have staging (development) and production environment.
+If we consider above example: we would like to deploy `master` branch to `staging` and `all tags` to `production` environment.
+The final `.gitlab-ci.yml` for that setup would look like this:
```
staging:
diff --git a/doc/examples/test-and-deploy-python-application-to-heroku.md b/doc/examples/test-and-deploy-python-application-to-heroku.md
index 162fd7e..890598c 100644
--- a/doc/examples/test-and-deploy-python-application-to-heroku.md
+++ b/doc/examples/test-and-deploy-python-application-to-heroku.md
@@ -49,10 +49,13 @@ You'll need to create two variables in `Project > Variables`:
Find your Heroku API key in [Manage Account](https://dashboard.heroku.com/account).
### Create Heroku application
-For each of your environments, you'll need to create a new Heroku application. You can do this through the [Dashboard](https://dashboard.heroku.com/).
+For each of your environments, you'll need to create a new Heroku application.
+You can do this through the [Dashboard](https://dashboard.heroku.com/).
### Create runner
-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). You can use public runners available on `ci.gitlab.com`, but you can register your own:
+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).
+ou can use public runners available on `ci.gitlab.com`, but you can register your own:
```
gitlab-ci-multi-runner register \
--non-interactive \
diff --git a/doc/examples/test-and-deploy-ruby-application-to-heroku.md b/doc/examples/test-and-deploy-ruby-application-to-heroku.md
index b94307f..8c661ef 100644
--- a/doc/examples/test-and-deploy-ruby-application-to-heroku.md
+++ b/doc/examples/test-and-deploy-ruby-application-to-heroku.md
@@ -1,5 +1,5 @@
-## Test and Deploy Python application to Heroku
-This example will guide you how to run tests in your Python application and deploy it automatiacally to staging and production Heroku application.
+## Test and Deploy Ruby application to Heroku
+This example will guide you how to run tests in your Ruby application and deploy it automatiacally to staging and production Heroku application.
You can check the [source](https://gitlab.com/ayufan/ruby-getting-started) and [CI status](https://ci.gitlab.com/projects/4050).
@@ -44,10 +44,13 @@ You'll need to create two variables in `Project > Variables`:
Find your Heroku API key in [Manage Account](https://dashboard.heroku.com/account).
### Create Heroku application
-For each of your environments, you'll need to create a new Heroku application. You can do this through the [Dashboard](https://dashboard.heroku.com/).
+For each of your environments, you'll need to create a new Heroku application.
+You can do this through the [Dashboard](https://dashboard.heroku.com/).
### Create runner
-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). You can use public runners available on `ci.gitlab.com`, but you can register your own:
+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).
+You can use public runners available on `ci.gitlab.com`, but you can register your own:
```
gitlab-ci-multi-runner register \
--non-interactive \