From 5fbb4d642736232d5753f3a5b03246d8870a4715 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Sat, 18 Jul 2015 11:46:53 +0530 Subject: [PATCH] readme: use `gitlab-ci` as the prefix in the container names --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 1bf06b2f..68dc2ff9 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ Alternately, you can manually launch the `gitlab` container and the supporting ` Step 1. Launch a postgresql container ```bash -docker run --name postgresql-gitlab -d \ +docker run --name gitlab-postgresql -d \ --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \ @@ -151,7 +151,7 @@ docker run --name postgresql-gitlab -d \ Step 2. Launch a redis container ```bash -docker run --name redis-gitlab -d \ +docker run --name gitlab-redis -d \ --volume /srv/docker/gitlab/redis:/var/lib/redis \ sameersbn/redis:latest ``` @@ -160,7 +160,7 @@ Step 3. Launch the gitlab container ```bash docker run --name gitlab -d \ - --link postgresql-gitlab:postgresql --link redis-gitlab:redisio \ + --link gitlab-postgresql:postgresql --link gitlab-redis:redisio \ --publish 10022:22 --publish 10080:80 \ --env 'GITLAB_PORT=10080' --env 'GITLAB_SSH_PORT=10022' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ @@ -260,7 +260,7 @@ sudo chcon -Rt svirt_sandbox_file_t /srv/docker/gitlab/postgresql The run command looks like this. ```bash -docker run --name postgresql-gitlab -d \ +docker run --name gitlab-postgresql -d \ --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --volume /srv/docker/gitlab/postgresql:/var/lib/postgresql \ @@ -272,7 +272,7 @@ The above command will create a database named `gitlabhq_production` and also cr We are now ready to start the GitLab application. ```bash -docker run --name gitlab -d --link postgresql-gitlab:postgresql \ +docker run --name gitlab -d --link gitlab-postgresql:postgresql \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ sameersbn/gitlab:7.12.2-2 ``` @@ -295,14 +295,14 @@ If you have been using the internal mysql server follow these instructions to mi Assuming that your mysql data is available at `/srv/docker/gitlab/mysql` ```bash -docker run --name mysql-gitlab -d \ +docker run --name gitlab-mysql -d \ --volume /srv/docker/gitlab/mysql:/var/lib/mysql \ sameersbn/mysql:latest ``` This will start a mysql container with your existing mysql data. Now login to the mysql container and create a user for the existing `gitlabhq_production` database. -All you need to do now is link this mysql container to the gitlab ci container using the `--link mysql-gitlab:mysql` option and provide the `DB_NAME`, `DB_USER` and `DB_PASS` parameters. +All you need to do now is link this mysql container to the gitlab ci container using the `--link gitlab-mysql:mysql` option and provide the `DB_NAME`, `DB_USER` and `DB_PASS` parameters. Refer to [Linking to MySQL Container](#linking-to-mysql-container) for more information. @@ -356,7 +356,7 @@ sudo chcon -Rt svirt_sandbox_file_t /srv/docker/gitlab/mysql The run command looks like this. ```bash -docker run --name mysql-gitlab -d \ +docker run --name gitlab-mysql -d \ --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --volume /srv/docker/gitlab/mysql:/var/lib/mysql \ @@ -368,7 +368,7 @@ The above command will create a database named `gitlabhq_production` and also cr We are now ready to start the GitLab application. ```bash -docker run --name gitlab -d --link mysql-gitlab:mysql \ +docker run --name gitlab -d --link gitlab-mysql:mysql \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ sameersbn/gitlab:7.12.2-2 ``` @@ -415,7 +415,7 @@ docker pull sameersbn/redis:latest Lets start the redis container ```bash -docker run --name redis-gitlab -d \ +docker run --name gitlab-redis -d \ --volume /srv/docker/gitlab/redis:/var/lib/redis \ sameersbn/redis:latest ``` @@ -423,7 +423,7 @@ docker run --name redis-gitlab -d \ We are now ready to start the GitLab application. ```bash -docker run --name gitlab -d --link redis-gitlab:redisio \ +docker run --name gitlab -d --link gitlab-redis:redisio \ sameersbn/gitlab:7.12.2-2 ```