diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-05-08 10:26:46 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-05-08 10:26:46 +0000 |
commit | b1837eef4ba610c4257ec691df0adc82deccf663 (patch) | |
tree | bdb81529bbe0c7faf03aef7baf55b4bcb5a0381c /doc/ci/examples/test-and-deploy-python-application-to-heroku.md | |
parent | c8ce50cc2c6602122571f0f05310f3074aa2fd11 (diff) | |
parent | dd4fe8e9bbdd1f9874f20fbbd481bf56158f4f0c (diff) | |
download | gitlab-ce-b1837eef4ba610c4257ec691df0adc82deccf663.tar.gz |
Merge branch 'update-doc-ci-examples' into 'master'
Update CI example docs.
Docs for CI examples are updated as follows:
- Fix a dead link from CI example top to `dpl`
- Specify Django for a Python project, not Rails
- Use the latest Python Docker image as [Heroku supports only Python 3.5.1 (and 2.7.11)](https://devcenter.heroku.com/articles/python-support)
- Show the latest Docker Hub URL links.
See merge request !4082
Diffstat (limited to 'doc/ci/examples/test-and-deploy-python-application-to-heroku.md')
-rw-r--r-- | doc/ci/examples/test-and-deploy-python-application-to-heroku.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/ci/examples/test-and-deploy-python-application-to-heroku.md b/doc/ci/examples/test-and-deploy-python-application-to-heroku.md index a236da53fe9..e4d3970deac 100644 --- a/doc/ci/examples/test-and-deploy-python-application-to-heroku.md +++ b/doc/ci/examples/test-and-deploy-python-application-to-heroku.md @@ -8,7 +8,7 @@ This is what the `.gitlab-ci.yml` file looks like for this project: ```yaml test: script: - # this configures django application to use attached postgres database that is run on `postgres` host + # this configures Django application to use attached postgres database that is run on `postgres` host - export DATABASE_URL=postgres://postgres:@postgres:5432/python-test-app - apt-get update -qy - apt-get install -y python-dev python-pip @@ -37,7 +37,7 @@ production: ``` This project has three jobs: -1. `test` - used to test rails application, +1. `test` - used to test Django application, 2. `staging` - used to automatically deploy staging environment every push to `master` branch 3. `production` - used to automatically deploy production environmnet for every created tag @@ -61,12 +61,12 @@ gitlab-ci-multi-runner register \ --non-interactive \ --url "https://gitlab.com/ci/" \ --registration-token "PROJECT_REGISTRATION_TOKEN" \ - --description "python-3.2" \ + --description "python-3.5" \ --executor "docker" \ - --docker-image python:3.2 \ + --docker-image python:3.5 \ --docker-postgres latest ``` -With the command above, you create a runner that uses [python:3.2](https://registry.hub.docker.com/u/library/python/) image and uses [postgres](https://registry.hub.docker.com/u/library/postgres/) database. +With the command above, you create a runner that uses [python:3.5](https://hub.docker.com/r/_/python/) image and uses [postgres](https://hub.docker.com/r/_/postgres/) database. To access PostgreSQL database you need to connect to `host: postgres` as user `postgres` without password. |