From d203dbc317b7280e01e0a5e2003f14a212ff6e2e Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 2 Dec 2014 21:22:51 +0530 Subject: [PATCH] release 7.5.2 --- Changelog.md | 2 +- README.md | 50 +++++++++++++++++++++++++------------------------- fig.yml | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Changelog.md b/Changelog.md index 2fd18610..4ea8a82b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,6 @@ # Changelog -**latest** +**7.5.2** - gitlab: upgrade to CE v.7.5.2 **7.5.1** diff --git a/README.md b/README.md index f65c1c84..1f25e32e 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Dockerfile to build a GitLab container image. ## Version -Current Version: **7.5.1** +Current Version: **7.5.2** # Hardware Requirements @@ -140,7 +140,7 @@ In your issue report please make sure you provide the following information: Pull the image from the docker index. This is the recommended method of installation as it is easier to update image. These builds are performed by the **Docker Trusted Build** service. ```bash -docker pull sameersbn/gitlab:7.5.1 +docker pull sameersbn/gitlab:7.5.2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -167,7 +167,7 @@ docker run --name='gitlab' -it --rm \ -p 10022:22 -p 10080:80 \ -v /var/run/docker.sock:/run/docker.sock \ -v $(which docker):/bin/docker \ -sameersbn/gitlab:7.5.1 +sameersbn/gitlab:7.5.2 ``` Or you can use [fig](http://www.fig.sh/). Assuming you have fig installed, @@ -208,7 +208,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.5.1 + sameersbn/gitlab:7.5.2 ``` ## Database @@ -259,7 +259,7 @@ We are now ready to start the GitLab application. 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.5.1 + sameersbn/gitlab:7.5.2 ``` #### Linking to MySQL Container @@ -301,7 +301,7 @@ We are now ready to start the GitLab application. ```bash docker run --name=gitlab -d --link mysql:mysql \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.5.1 + sameersbn/gitlab:7.5.2 ``` The image will automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container using the magic of docker links and works with the following images: @@ -329,7 +329,7 @@ We are now ready to start the GitLab application. 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.5.1 + sameersbn/gitlab:7.5.2 ``` #### Linking to PostgreSQL Container @@ -371,7 +371,7 @@ We are now ready to start the GitLab application. ```bash docker run --name=gitlab -d --link postgresql:postgresql \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.5.1 + sameersbn/gitlab:7.5.2 ``` The image will automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container using the magic of docker links and works with the following images: @@ -396,7 +396,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.5.1 + sameersbn/gitlab:7.5.2 ``` ### Linking to Redis Container @@ -421,7 +421,7 @@ We are now ready to start the GitLab application. ```bash docker run --name=gitlab -d --link redis:redisio \ - sameersbn/gitlab:7.5.1 + sameersbn/gitlab:7.5.2 ``` ### Mail @@ -434,7 +434,7 @@ Please refer the [Available Configuration Parameters](#available-configuration-p 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.5.1 + sameersbn/gitlab:7.5.2 ``` ### SSL @@ -507,7 +507,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.5.1 + sameersbn/gitlab:7.5.2 ``` 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. @@ -523,7 +523,7 @@ docker run --name=gitlab -d \ -e 'GITLAB_HTTPS=true' -e 'SSL_SELF_SIGNED=true' \ -e 'GITLAB_HTTPS_HSTS_MAXAGE=2592000' -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.5.1 + sameersbn/gitlab:7.5.2 ``` If you want to completely disable HSTS set `GITLAB_HTTPS_HSTS_ENABLED` to `false`. @@ -545,7 +545,7 @@ docker run --name=gitlab -d -p 10022:22 -p 10080:80 \ -e 'GITLAB_SSH_PORT=10022' -e 'GITLAB_PORT=443' \ -e 'GITLAB_HTTPS=true' -e 'SSL_SELF_SIGNED=true' \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.5.1 + sameersbn/gitlab:7.5.2 ``` Again, drop the `-e 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -589,7 +589,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name=gitlab -it --rm \ -e 'GITLAB_RELATIVE_URL_ROOT=/git' \ -v /opt/gitlab/data:/home/git/data \ - sameersbn/gitlab:7.5.1 + sameersbn/gitlab:7.5.2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -604,7 +604,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.5.1 + sameersbn/gitlab:7.5.2 ``` If you are using an external mysql database @@ -615,7 +615,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.5.1 + sameersbn/gitlab:7.5.2 ``` ### OmniAuth Integration @@ -679,14 +679,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name=gitlab -it --rm [options] \ -e "USERMAP_UID=$(id -u git)" -e "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:7.5.1 + sameersbn/gitlab:7.5.2 ``` When changing this mapping, all files and directories in the mounted data volume `/home/git/data` have to be re-owned by the new ids. This can be achieved automatically using the following command: ```bash docker run --name=gitlab -d [OPTIONS] \ - sameersbn/gitlab:7.5.1 app:sanitize + sameersbn/gitlab:7.5.2 app:sanitize ``` ### Available Configuration Parameters @@ -789,7 +789,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.5.1 app:rake gitlab:backup:create + sameersbn/gitlab:7.5.2 app:rake gitlab:backup:create ``` A backup will be created in the backups folder of the [Data Store](#data-store). You can change that behavior by setting your own path within the container. To do so you have to pass the argument `-e "GITLAB_BACKUP_DIR:/path/to/backups"` to the docker run command. @@ -806,7 +806,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.5.1 app:rake gitlab:backup:restore + sameersbn/gitlab:7.5.2 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. @@ -854,7 +854,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.5.1 +docker pull sameersbn/gitlab:7.5.2 ``` - **Step 2**: Stop and remove the currently running image @@ -876,7 +876,7 @@ Replace **xx.xx.xx** with the version you are upgrading from. For example, if yo - **Step 4**: Start the image ```bash -docker run --name=gitlab -d [OPTIONS] sameersbn/gitlab:7.5.1 +docker run --name=gitlab -d [OPTIONS] sameersbn/gitlab:7.5.2 ``` ## Rake Tasks @@ -885,14 +885,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.5.1 app:rake gitlab:env:info + sameersbn/gitlab:7.5.2 app:rake gitlab:env:info ``` Similarly, to import bare repositories into GitLab project instance ```bash docker run --name=gitlab -d [OPTIONS] \ - sameersbn/gitlab:7.5.1 app:rake gitlab:import:repos + sameersbn/gitlab:7.5.2 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/fig.yml b/fig.yml index d9561d6b..658cf75b 100644 --- a/fig.yml +++ b/fig.yml @@ -5,7 +5,7 @@ postgresql: - DB_PASS=secretpassword - DB_NAME=gitlabhq_production gitlab: - image: sameersbn/gitlab:7.5.1 + image: sameersbn/gitlab:7.5.2 links: - redis:redisio - postgresql:postgresql