From f3d3d2dfad9193306dd5b5d7691c969eee252b52 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 26 Aug 2014 01:50:04 +0530 Subject: [PATCH] release 7.2.0-1 --- Changelog.md | 2 +- README.md | 56 ++++++++++++++++++++++++++-------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Changelog.md b/Changelog.md index 8a9de2f4..08d04bba 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,6 @@ # Changelog -**latest** +**7.2.0-1** - fix nginx static route handling when GITLAB_RELATIVE_URL_ROOT is used. - fix relative root access without the trailing '/' character - added seperate server block for http config in gitlab.https.permissive. Fixes #127 diff --git a/README.md b/README.md index e87004b6..382cea68 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ Dockerfile to build a GitLab container image. ## Version -Current Version: 7.2.0 +Current Version: 7.2.0-1 # Hardware Requirements @@ -134,7 +134,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 +docker pull sameersbn/gitlab:7.2.0-1 ``` Alternately you can build the image yourself. @@ -152,7 +152,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 +sameersbn/gitlab:7.2.0-1 ``` __NOTE__: Please allow a couple of minutes for the GitLab application to start. @@ -183,7 +183,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 + sameersbn/gitlab:7.2.0-1 ``` ## Database @@ -218,7 +218,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 + -v /opt/gitlab/mysql:/var/lib/mysql sameersbn/gitlab:7.2.0-1 ``` This will make sure that the data stored in the database is not lost when the image is stopped and started again. @@ -242,7 +242,7 @@ To make sure the database is initialized start the container with **app:rake git 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 app:rake gitlab:setup + sameersbn/gitlab:7.2.0-1 app:rake gitlab:setup ``` Append `force=yes` to the above command to skip the confirmation prompt. @@ -255,7 +255,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 + sameersbn/gitlab:7.2.0-1 ``` #### Linking to MySQL Container @@ -302,7 +302,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 app:rake gitlab:setup + sameersbn/gitlab:7.2.0-1 app:rake gitlab:setup ``` **NOTE: The above setup is performed only for the first run**. @@ -314,7 +314,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 + sameersbn/gitlab:7.2.0-1 ``` ### PostgreSQL @@ -336,7 +336,7 @@ To make sure the database is initialized start the container with **app:rake git 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 app:rake gitlab:setup + sameersbn/gitlab:7.2.0-1 app:rake gitlab:setup ``` **NOTE: The above setup is performed only for the first run**. @@ -347,7 +347,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 + sameersbn/gitlab:7.2.0-1 ``` #### Linking to PostgreSQL Container @@ -397,7 +397,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 app:rake gitlab:setup + sameersbn/gitlab:7.2.0-1 app:rake gitlab:setup ``` **NOTE: The above setup is performed only for the first run**. @@ -409,7 +409,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 + sameersbn/gitlab:7.2.0-1 ``` ## Redis @@ -435,7 +435,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 + sameersbn/gitlab:7.2.0-1 ``` ### Linking to Redis Container You can link this image with a redis container to satisfy gitlab's redis requirement. The alias of the redis server container should be set to **redisio** while linking with the gitlab image. @@ -458,7 +458,7 @@ We are now ready to start the GitLab application. ```bash docker run --name=gitlab -d --link redis:redisio \ - sameersbn/gitlab:7.2.0 + sameersbn/gitlab:7.2.0-1 ``` ### Mail @@ -478,7 +478,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 + sameersbn/gitlab:7.2.0-1 ``` ### SSL @@ -546,7 +546,7 @@ HTTPS support can be enabled by setting the GITLAB_HTTPS option to true. Additio 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 + sameersbn/gitlab:7.2.0-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. @@ -565,7 +565,7 @@ docker run --name=gitlab -d \ -e 'GITLAB_HTTPS=true' -e 'SSL_SELF_SIGNED=true' \ -e 'GITLAB_HTTPS_ONLY=false' \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.2.0 + sameersbn/gitlab:7.2.0-1 ``` Again, drop the `-e 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -605,7 +605,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 + sameersbn/gitlab:7.2.0-1 ``` If you are using an external mysql database @@ -616,7 +616,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 + sameersbn/gitlab:7.2.0-1 ``` ### Run under sub URI @@ -627,7 +627,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 + sameersbn/gitlab:7.2.0-1 ``` When you change the sub URI path, you need to recompile all precompiled assets. This can be done with either deleting tmp/cache/VERSION file under data store, or just `rm -Rf /PATH/TO/DATA_STORE/tmp`. After cleaning up cache files, restart the container. @@ -763,7 +763,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 app:rake gitlab:backup:create + sameersbn/gitlab:7.2.0-1 app:rake gitlab:backup:create ``` A backup will be created in the backups folder of the [Data Store](#data-store) @@ -780,7 +780,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 app:rake gitlab:backup:restore + sameersbn/gitlab:7.2.0-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. @@ -824,7 +824,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 +docker pull sameersbn/gitlab:7.2.0-1 ``` - **Step 2**: Stop and remove the currently running image @@ -838,13 +838,13 @@ docker rm gitlab ```bash docker run --name=gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:7.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:7.2.0-1 app:rake gitlab:backup:create ``` - **Step 4**: Start the image ```bash -docker run --name=gitlab -d [OPTIONS] sameersbn/gitlab:7.2.0 +docker run --name=gitlab -d [OPTIONS] sameersbn/gitlab:7.2.0-1 ``` ## Rake Tasks @@ -853,14 +853,14 @@ The app:rake command allows you to run gitlab rake tasks. To run a rake task sim ```bash docker run --name=gitlab -d [OPTIONS] \ - sameersbn/gitlab:7.2.0 app:rake gitlab:env:info + sameersbn/gitlab:7.2.0-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 app:rake gitlab:import:repos + sameersbn/gitlab:7.2.0-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.