diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-24 00:09:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-24 00:09:19 +0300 |
| commit | 5c2568f176708552dfdefa9fc8d5f01ec6a019a1 (patch) | |
| tree | dca0281e3b7b973d9c06ec9a9470323f0a4cc581 /doc/ci/services | |
| parent | 84e315459585e3339b964e06236dd3f41e70ba2b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/services')
| -rw-r--r-- | doc/ci/services/mysql.md | 2 | ||||
| -rw-r--r-- | doc/ci/services/postgres.md | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/ci/services/mysql.md b/doc/ci/services/mysql.md index bbab1194191..cc1ef01d10f 100644 --- a/doc/ci/services/mysql.md +++ b/doc/ci/services/mysql.md @@ -78,7 +78,7 @@ GitLab Runner with the Shell executor. mysql -u root -p ``` -1. Create a user (in this case, `runner`) that will be used by your +1. Create a user (in this case, `runner`) that is used by your application. Change `$password` in the command to a strong password. At the `mysql>` prompt, type: diff --git a/doc/ci/services/postgres.md b/doc/ci/services/postgres.md index 96552ab1245..a4ecbed436b 100644 --- a/doc/ci/services/postgres.md +++ b/doc/ci/services/postgres.md @@ -7,7 +7,7 @@ type: reference # Using PostgreSQL -As many applications depend on PostgreSQL as their database, you will +As many applications depend on PostgreSQL as their database, you eventually need it in order for your tests to run. Below you are guided how to do this with the Docker and Shell executors of GitLab Runner. @@ -70,7 +70,7 @@ The next step is to create a user, so sign in to PostgreSQL: sudo -u postgres psql -d template1 ``` -Then create a user (in our case `runner`) which will be used by your +Then create a user (in our case `runner`) which is used by your application. Change `$password` in the command below to a real strong password. NOTE: **Note:** @@ -106,7 +106,7 @@ psql -U runner -h localhost -d nice_marmot -W ``` This command explicitly directs `psql` to connect to localhost to use the md5 -authentication. If you omit this step, you'll be denied access. +authentication. If you omit this step, you are denied access. Finally, configure your application to use the database, for example: @@ -124,4 +124,4 @@ convenience that runs on [GitLab.com](https://gitlab.com) using our publicly available [shared runners](../runners/README.md). Want to hack on it? Fork it, commit, and push your changes. Within a few -moments the changes will be picked by a public runner and the job will begin. +moments the changes are picked by a public runner and the job begins. |