From 6928496e87ecd20a2c686d17ba0fdd45c142998e Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 26 Nov 2015 11:58:53 +0530 Subject: [PATCH] release 8.2.1 --- Changelog.md | 2 +- README.md | 48 +++++++++++++++++++++---------------------- VERSION | 2 +- docker-compose.yml | 2 +- kubernetes/gitlab.yml | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Changelog.md b/Changelog.md index 46fb7e51..8319647a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,7 +2,7 @@ This file only reflects the changes that are made in this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) for the list of changes in GitLab. -**latest** +**8.2.1** - expose rack_attack configuration options - gitlab-shell: upgrade to v.2.6.8 - gitlab: upgrade to CE v8.2.1 diff --git a/README.md b/README.md index 04b48954..21152c18 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Deploy to Tutum](https://s.tutum.co/deploy-to-tutum.svg)](https://dashboard.tutum.co/stack/deploy/) -# sameersbn/gitlab:8.2.0 +# sameersbn/gitlab:8.2.1 - [Introduction](#introduction) - [Version](#version) @@ -113,7 +113,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co > **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab) ```bash -docker pull sameersbn/gitlab:8.2.0 +docker pull sameersbn/gitlab:8.2.1 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -175,7 +175,7 @@ docker run --name gitlab -d \ --env 'GITLAB_PORT=10080' --env 'GITLAB_SSH_PORT=10022' \ --env 'GITLAB_SECRETS_DB_KEY_BASE=long-and-random-alpha-numeric-string' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:8.2.0 + sameersbn/gitlab:8.2.1 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -211,7 +211,7 @@ Volumes can be mounted in docker by specifying the `-v` option in the docker run ```bash docker run --name gitlab -d \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:8.2.0 + sameersbn/gitlab:8.2.1 ``` ## Database @@ -242,7 +242,7 @@ docker run --name gitlab -d \ --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:8.2.0 + sameersbn/gitlab:8.2.1 ``` #### Linking to PostgreSQL Container @@ -285,7 +285,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-postgresql:postgresql \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:8.2.0 + sameersbn/gitlab:8.2.1 ``` Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container as they are specified in the `docker run` command for the postgresql container. This is made possible using the magic of docker links and works with the following images: @@ -338,7 +338,7 @@ docker run --name gitlab -d \ --env 'DB_HOST=192.168.1.100' --env 'DB_NAME=gitlabhq_production' \ --env 'DB_USER=gitlab' --env 'DB_PASS=password' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:8.2.0 + sameersbn/gitlab:8.2.1 ``` #### Linking to MySQL Container @@ -381,7 +381,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-mysql:mysql \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:8.2.0 + sameersbn/gitlab:8.2.1 ``` Here the image will also automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container as they are specified in the `docker run` command for the mysql container. This is made possible using the magic of docker links and works with the following images: @@ -408,7 +408,7 @@ The image can be configured to use an external redis server. The configuration s ```bash docker run --name gitlab -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab:8.2.0 + sameersbn/gitlab:8.2.1 ``` ### Linking to Redis Container @@ -435,7 +435,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:8.2.0 + sameersbn/gitlab:8.2.1 ``` ### Mail @@ -465,7 +465,7 @@ If you are using Gmail then all you need to do is: docker run --name gitlab -d \ --env 'IMAP_USER=USER@gmail.com' --env 'IMAP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:8.2.0 + sameersbn/gitlab:8.2.1 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -542,7 +542,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=10443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:8.2.0 + sameersbn/gitlab:8.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. @@ -558,7 +558,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'GITLAB_HTTPS_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:8.2.0 + sameersbn/gitlab:8.2.1 ``` If you want to completely disable HSTS set `GITLAB_HTTPS_HSTS_ENABLED` to `false`. @@ -581,7 +581,7 @@ docker run --name gitlab -d \ --env 'GITLAB_SSH_PORT=10022' --env 'GITLAB_PORT=443' \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:8.2.0 + sameersbn/gitlab:8.2.1 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -629,7 +629,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t docker run --name gitlab -it --rm \ --env 'GITLAB_RELATIVE_URL_ROOT=/git' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:8.2.0 + sameersbn/gitlab:8.2.1 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -725,14 +725,14 @@ Also the container processes seem to be executed as the host's user/group `1000` ```bash docker run --name gitlab -it --rm [options] \ --env "USERMAP_UID=$(id -u git)" --env "USERMAP_GID=$(id -g git)" \ - sameersbn/gitlab:8.2.0 + sameersbn/gitlab:8.2.1 ``` 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:8.2.0 app:sanitize + sameersbn/gitlab:8.2.1 app:sanitize ``` ### Piwik @@ -913,7 +913,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:8.2.0 app:rake gitlab:backup:create + sameersbn/gitlab:8.2.1 app:rake gitlab:backup:create ``` A backup will be created in the backups folder of the [Data Store](#data-store). You can change the location of the backups using the `GITLAB_BACKUP_DIR` configuration parameter. @@ -934,7 +934,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:8.2.0 app:rake gitlab:backup:restore + sameersbn/gitlab:8.2.1 app:rake gitlab:backup:restore ``` The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue. @@ -943,7 +943,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:8.2.0 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:8.2.1 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Automated Backups @@ -968,7 +968,7 @@ 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:8.2.0 app:rake gitlab:env:info + sameersbn/gitlab:8.2.1 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -981,7 +981,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -d [OPTIONS] \ - sameersbn/gitlab:8.2.0 app:rake gitlab:import:repos + sameersbn/gitlab:8.2.1 app:rake gitlab:import:repos ``` Or @@ -1003,7 +1003,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:8.2.0 +docker pull sameersbn/gitlab:8.2.1 ``` - **Step 2**: Stop and remove the currently running image @@ -1027,7 +1027,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are > **Note**: Since GitLab `8.0.0` you need to provide the `GITLAB_SECRETS_DB_KEY_BASE` parameter while starting the image. ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:8.2.0 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:8.2.1 ``` ## Shell Access diff --git a/VERSION b/VERSION index fbb9ea12..2b0aa212 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.2.0 +8.2.1 diff --git a/docker-compose.yml b/docker-compose.yml index 3c7e3304..67cfffaa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ postgresql: - /srv/docker/gitlab/postgresql:/var/lib/postgresql gitlab: restart: always - image: sameersbn/gitlab:8.2.0 + image: sameersbn/gitlab:8.2.1 links: - redis:redisio - postgresql:postgresql diff --git a/kubernetes/gitlab.yml b/kubernetes/gitlab.yml index 30fa17c7..f9668a3e 100644 --- a/kubernetes/gitlab.yml +++ b/kubernetes/gitlab.yml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: gitlab - image: sameersbn/gitlab:8.2.0 + image: sameersbn/gitlab:8.2.1 env: - name: TZ value: Asia/Kolkata