From ba470561dc063a7fa179c95d10ab3ab58c6e613a Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Fri, 29 Aug 2014 00:02:44 +0530 Subject: [PATCH] release 7.2.1 --- Changelog.md | 2 +- README.md | 59 +++++++++++++++++++++++++++------------------------- VERSION | 2 +- 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/Changelog.md b/Changelog.md index 88138a0d..878c290e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,6 @@ # Changelog -**latest** +**7.2.1** - upgrade to gitlab-ce 7.2.1 - added new SMTP_ENABLED configuration option. diff --git a/README.md b/README.md index 0cbaa806..6a409cc0 100644 --- a/README.md +++ b/README.md @@ -54,14 +54,17 @@ - [References](#references) # Introduction + Dockerfile to build a GitLab container image. ## Version -Current Version: **7.2.0-1** + +Current Version: **7.2.1** # Hardware Requirements ## CPU + - 1 core works for under 100 users but the responsiveness might suffer - 2 cores is the recommended number of cores and supports up to 100 users - 4 cores supports up to 1,000 users @@ -132,7 +135,7 @@ docker pull sameersbn/gitlab:latest Since version `6.3.0`, the image builds are being tagged. You can now pull a particular version of gitlab by specifying the version number. For example, ```bash -docker pull sameersbn/gitlab:7.2.0-1 +docker pull sameersbn/gitlab:7.2.1 ``` Alternately you can build the image yourself. @@ -151,7 +154,7 @@ Run the gitlab image docker run --name='gitlab' -it --rm \ -p 10022:22 -p 10080:80 \ -e 'GITLAB_PORT=10080' -e 'GITLAB_SSH_PORT=10022' \ -sameersbn/gitlab:7.2.0-1 +sameersbn/gitlab:7.2.1 ``` __NOTE__: Please allow a couple of minutes for the GitLab application to start. @@ -183,7 +186,7 @@ Volumes can be mounted in docker by specifying the **'-v'** option in the docker ```bash docker run --name=gitlab -d \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.2.0-1 + sameersbn/gitlab:7.2.1 ``` ## Database @@ -219,7 +222,7 @@ The updated run command looks like this. ```bash docker run --name=gitlab -d \ -v /opt/gitlab/data:/home/git/data \ - -v /opt/gitlab/mysql:/var/lib/mysql sameersbn/gitlab:7.2.0-1 + -v /opt/gitlab/mysql:/var/lib/mysql sameersbn/gitlab:7.2.1 ``` This will make sure that the data stored in the database is not lost when the image is stopped and started again. @@ -244,7 +247,7 @@ To make sure the database is initialized start the container with `app:rake gitl docker run --name=gitlab -it --rm \ -e 'DB_HOST=192.168.1.100' -e 'DB_NAME=gitlabhq_production' -e 'DB_USER=gitlab' -e 'DB_PASS=password' \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.2.0-1 app:rake gitlab:setup + sameersbn/gitlab:7.2.1 app:rake gitlab:setup ``` Append `force=yes` to the above command to skip the confirmation prompt. @@ -257,7 +260,7 @@ This will initialize the gitlab database. Now that the database is initialized, docker run --name=gitlab -d \ -e 'DB_HOST=192.168.1.100' -e 'DB_NAME=gitlabhq_production' -e 'DB_USER=gitlab' -e 'DB_PASS=password' \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.2.0-1 + sameersbn/gitlab:7.2.1 ``` #### Linking to MySQL Container @@ -313,7 +316,7 @@ docker run --name=gitlab -it --rm --link mysql:mysql \ -e 'DB_USER=gitlab' -e 'DB_PASS=password' \ -e 'DB_NAME=gitlabhq_production' \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.2.0-1 app:rake gitlab:setup + sameersbn/gitlab:7.2.1 app:rake gitlab:setup ``` **NOTE: The above setup is performed only for the first run**. @@ -325,7 +328,7 @@ docker run --name=gitlab -d --link mysql:mysql \ -e 'DB_USER=gitlab' -e 'DB_PASS=password' \ -e 'DB_NAME=gitlabhq_production' \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.2.0-1 + sameersbn/gitlab:7.2.1 ``` ### PostgreSQL @@ -348,7 +351,7 @@ To make sure the database is initialized start the container with `app:rake gitl docker run --name=gitlab -it --rm \ -e 'DB_TYPE=postgres' -e 'DB_HOST=192.168.1.100' -e 'DB_NAME=gitlabhq_production' -e 'DB_USER=gitlab' -e 'DB_PASS=password' \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.2.0-1 app:rake gitlab:setup + sameersbn/gitlab:7.2.1 app:rake gitlab:setup ``` **NOTE: The above setup is performed only for the first run**. @@ -359,7 +362,7 @@ This will initialize the gitlab database. Now that the database is initialized, docker run --name=gitlab -d \ -e 'DB_TYPE=postgres' -e 'DB_HOST=192.168.1.100' -e 'DB_NAME=gitlabhq_production' -e 'DB_USER=gitlab' -e 'DB_PASS=password' \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.2.0-1 + sameersbn/gitlab:7.2.1 ``` #### Linking to PostgreSQL Container @@ -418,7 +421,7 @@ docker run --name=gitlab -it --rm --link postgresql:postgresql \ -e 'DB_USER=gitlab' -e 'DB_PASS=password' \ -e 'DB_NAME=gitlabhq_production' \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.2.0-1 app:rake gitlab:setup + sameersbn/gitlab:7.2.1 app:rake gitlab:setup ``` **NOTE: The above setup is performed only for the first run**. @@ -430,7 +433,7 @@ docker run --name=gitlab -d --link postgresql:postgresql \ -e 'DB_USER=gitlab' -e 'DB_PASS=password' \ -e 'DB_NAME=gitlabhq_production' \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.2.0-1 + sameersbn/gitlab:7.2.1 ``` ## Redis @@ -457,7 +460,7 @@ The image can be configured to use an external redis server instead of starting ```bash docker run --name=gitlab -it --rm \ -e 'REDIS_HOST=192.168.1.100' -e 'REDIS_PORT=6379' \ - sameersbn/gitlab:7.2.0-1 + sameersbn/gitlab:7.2.1 ``` ### Linking to Redis Container @@ -482,7 +485,7 @@ We are now ready to start the GitLab application. ```bash docker run --name=gitlab -d --link redis:redisio \ - sameersbn/gitlab:7.2.0-1 + sameersbn/gitlab:7.2.1 ``` ### Mail @@ -504,7 +507,7 @@ The following environment variables need to be specified to get mail support to docker run --name=gitlab -d \ -e 'SMTP_USER=USER@gmail.com' -e 'SMTP_PASS=PASSWORD' \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.2.0-1 + sameersbn/gitlab:7.2.1 ``` ### SSL @@ -577,7 +580,7 @@ HTTPS support can be enabled by setting the `GITLAB_HTTPS` option to `true`. Add docker run --name=gitlab -d \ -e 'GITLAB_HTTPS=true' -e 'SSL_SELF_SIGNED=true' \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.2.0-1 + sameersbn/gitlab:7.2.1 ``` In this configuration, any requests made over the plain http protocol will automatically be redirected to use the https protocol. However, this is not optimal when using a load balancer. @@ -602,7 +605,7 @@ docker run --name=gitlab -d -p 10022:22 -p 10080:80 \ -e 'GITLAB_HTTPS=true' -e 'GITLAB_HTTPS_ONLY=false' \ -e 'SSL_SELF_SIGNED=true' \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.2.0-1 + sameersbn/gitlab:7.2.1 ``` Again, drop the `-e 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -644,7 +647,7 @@ docker run --name=gitlab -d -h git.local.host \ -v /opt/gitlab/mysql:/var/lib/mysql \ -e 'GITLAB_HOST=git.local.host' -e 'GITLAB_EMAIL=gitlab@local.host' \ -e 'SMTP_USER=USER@gmail.com' -e 'SMTP_PASS=PASSWORD' \ - sameersbn/gitlab:7.2.0-1 + sameersbn/gitlab:7.2.1 ``` If you are using an external mysql database @@ -655,7 +658,7 @@ docker run --name=gitlab -d -h git.local.host \ -e 'DB_HOST=192.168.1.100' -e 'DB_NAME=gitlabhq_production' -e 'DB_USER=gitlab' -e 'DB_PASS=password' \ -e 'GITLAB_HOST=git.local.host' -e 'GITLAB_EMAIL=gitlab@local.host' \ -e 'SMTP_USER=USER@gmail.com' -e 'SMTP_PASS=PASSWORD' \ - sameersbn/gitlab:7.2.0-1 + sameersbn/gitlab:7.2.1 ``` ### Run under sub URI @@ -667,7 +670,7 @@ The path should start with slash, and should not have any trailing slashes. docker run --name=gitlab -d \ -v /opt/gitlab/data:/home/git/data \ -e 'GITLAB_RELATIVE_URL_ROOT=/gitlab' \ - sameersbn/gitlab:7.2.0-1 + sameersbn/gitlab:7.2.1 ``` When you change the sub URI path, you need to recompile all precompiled assets. This can be done by `rm -rf /PATH/TO/DATA_STORE/tmp`. After cleaning up cache files, restart the container. @@ -808,7 +811,7 @@ To take a backup all you need to do is run the gitlab rake task to create a back ```bash docker run --name=gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:7.2.0-1 app:rake gitlab:backup:create + sameersbn/gitlab:7.2.1 app:rake gitlab:backup:create ``` A backup will be created in the backups folder of the [Data Store](#data-store) @@ -825,7 +828,7 @@ To restore a backup, run the image in interactive (-it) mode and pass the "app:r ```bash docker run --name=gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:7.2.0-1 app:rake gitlab:backup:restore + sameersbn/gitlab:7.2.1 app:rake gitlab:backup:restore ``` The restore operation will list all available backups in reverse chronological order. Select the backup you want to restore and gitlab will do its job. @@ -869,7 +872,7 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:7.2.0-1 +docker pull sameersbn/gitlab:7.2.1 ``` - **Step 2**: Stop and remove the currently running image @@ -883,13 +886,13 @@ docker rm gitlab ```bash docker run --name=gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:7.2.0-1 app:rake gitlab:backup:create + sameersbn/gitlab:7.2.1 app:rake gitlab:backup:create ``` - **Step 4**: Start the image ```bash -docker run --name=gitlab -d [OPTIONS] sameersbn/gitlab:7.2.0-1 +docker run --name=gitlab -d [OPTIONS] sameersbn/gitlab:7.2.1 ``` ## Rake Tasks @@ -898,14 +901,14 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s ```bash docker run --name=gitlab -d [OPTIONS] \ - sameersbn/gitlab:7.2.0-1 app:rake gitlab:env:info + sameersbn/gitlab:7.2.1 app:rake gitlab:env:info ``` Similarly, to import bare repositories into GitLab project instance ```bash docker run --name=gitlab -d [OPTIONS] \ - sameersbn/gitlab:7.2.0-1 app:rake gitlab:import:repos + sameersbn/gitlab:7.2.1 app:rake gitlab:import:repos ``` For a complete list of available rake tasks please refer https://github.com/gitlabhq/gitlabhq/tree/master/doc/raketasks or the help section of your gitlab installation. diff --git a/VERSION b/VERSION index 0ee843cc..b26a34e4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.2.0 +7.2.1