diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 18:09:15 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 18:09:15 +0300 |
commit | 536aa3a1f4b96abc4ca34489bf2cbe503afcded7 (patch) | |
tree | 88d08f7dfa29a32d6526773c4fe0fefd9f2bc7d1 /doc/ci/services | |
parent | 50ae4065530c4eafbeb7c5ff2c462c48c02947ca (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/services')
-rw-r--r-- | doc/ci/services/mysql.md | 16 | ||||
-rw-r--r-- | doc/ci/services/postgres.md | 12 | ||||
-rw-r--r-- | doc/ci/services/redis.md | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/doc/ci/services/mysql.md b/doc/ci/services/mysql.md index ce69a7df885..e21b62e93cf 100644 --- a/doc/ci/services/mysql.md +++ b/doc/ci/services/mysql.md @@ -56,7 +56,7 @@ GitLab Runner with the Shell executor. First install the MySQL server: -```bash +```shell sudo apt-get install -y mysql-server mysql-client libmysqlclient-dev ``` @@ -68,7 +68,7 @@ the root user.* The next step is to create a user, so login to MySQL as root: -```bash +```shell mysql -u root -p ``` @@ -77,38 +77,38 @@ application. Change `$password` in the command below to a real strong password. *Note: Do not type `mysql>`, this is part of the MySQL prompt.* -```bash +```shell mysql> CREATE USER 'runner'@'localhost' IDENTIFIED BY '$password'; ``` Create the database: -```bash +```shell mysql> CREATE DATABASE IF NOT EXISTS `<your_mysql_database>` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`; ``` Grant the necessary permissions on the database: -```bash +```shell mysql> GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, CREATE TEMPORARY TABLES, DROP, INDEX, ALTER, LOCK TABLES ON `<your_mysql_database>`.* TO 'runner'@'localhost'; ``` If all went well you can now quit the database session: -```bash +```shell mysql> \q ``` Now, try to connect to the newly created database to check that everything is in place: -```bash +```shell mysql -u runner -p -D <your_mysql_database> ``` As a final step, configure your application to use the database, for example: -```bash +```shell Host: localhost User: runner Password: $password diff --git a/doc/ci/services/postgres.md b/doc/ci/services/postgres.md index 142f4f262e5..a137f10949f 100644 --- a/doc/ci/services/postgres.md +++ b/doc/ci/services/postgres.md @@ -57,13 +57,13 @@ GitLab Runner with the Shell executor. First install the PostgreSQL server: -```bash +```shell sudo apt-get install -y postgresql postgresql-client libpq-dev ``` The next step is to create a user, so login to PostgreSQL: -```bash +```shell sudo -u postgres psql -d template1 ``` @@ -72,7 +72,7 @@ application. Change `$password` in the command below to a real strong password. *__Note:__ Do not type `template1=#`, this is part of the PostgreSQL prompt.* -```bash +```shell template1=# CREATE USER runner WITH PASSWORD '$password' CREATEDB; ``` @@ -83,20 +83,20 @@ testing framework you have tools that drop and create databases.* Create the database and grant all privileges on it for the user `runner`: -```bash +```shell template1=# CREATE DATABASE nice_marmot OWNER runner; ``` If all went well you can now quit the database session: -```bash +```shell template1=# \q ``` Now, try to connect to the newly created database with the user `runner` to check that everything is in place. -```bash +```shell psql -U runner -h localhost -d nice_marmot -W ``` diff --git a/doc/ci/services/redis.md b/doc/ci/services/redis.md index ccb92fa94d7..b04b36f7a04 100644 --- a/doc/ci/services/redis.md +++ b/doc/ci/services/redis.md @@ -40,13 +40,13 @@ Runner with the Shell executor. In your build machine install the Redis server: -```bash +```shell sudo apt-get install redis-server ``` Verify that you can connect to the server with the `gitlab-runner` user: -```bash +```shell # Try connecting the Redis server sudo -u gitlab-runner -H redis-cli |