From e4acfa1e2405f1925578f8ed5cdb4fcff537671e Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 21 Jan 2016 13:05:38 +0530 Subject: [PATCH] release 8.3.4-2 --- README.md | 50 +++++++++++++++++++++---------------------- VERSION | 2 +- docker-compose.yml | 2 +- kubernetes/gitlab.yml | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 2f7f6a87..dbbe93e0 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.3.4-1 +# sameersbn/gitlab:8.3.4-2 - [Introduction](#introduction) - [Changelog](Changelog.md) @@ -108,7 +108,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.3.4-1 +docker pull sameersbn/gitlab:8.3.4-2 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -170,7 +170,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.3.4-1 + sameersbn/gitlab:8.3.4-2 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -206,7 +206,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.3.4-1 + sameersbn/gitlab:8.3.4-2 ``` ## Database @@ -237,7 +237,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.3.4-1 + sameersbn/gitlab:8.3.4-2 ``` #### Linking to PostgreSQL Container @@ -280,7 +280,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.3.4-1 + sameersbn/gitlab:8.3.4-2 ``` 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: @@ -334,7 +334,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.3.4-1 + sameersbn/gitlab:8.3.4-2 ``` #### Linking to MySQL Container @@ -377,7 +377,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.3.4-1 + sameersbn/gitlab:8.3.4-2 ``` 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: @@ -404,7 +404,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.3.4-1 + sameersbn/gitlab:8.3.4-2 ``` ### Linking to Redis Container @@ -431,7 +431,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:8.3.4-1 + sameersbn/gitlab:8.3.4-2 ``` ### Mail @@ -461,7 +461,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.3.4-1 + sameersbn/gitlab:8.3.4-2 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified. @@ -538,7 +538,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.3.4-1 + sameersbn/gitlab:8.3.4-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. @@ -554,7 +554,7 @@ docker run --name gitlab -d \ --env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \ --env 'NGINX_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:8.3.4-1 + sameersbn/gitlab:8.3.4-2 ``` If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`. @@ -577,7 +577,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.3.4-1 + sameersbn/gitlab:8.3.4-2 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -625,7 +625,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.3.4-1 + sameersbn/gitlab:8.3.4-2 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -721,14 +721,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.3.4-1 + sameersbn/gitlab:8.3.4-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:8.3.4-1 app:sanitize + sameersbn/gitlab:8.3.4-2 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.3.4-1 app:rake gitlab:backup:create + sameersbn/gitlab:8.3.4-2 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.3.4-1 app:rake gitlab:backup:restore + sameersbn/gitlab:8.3.4-2 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.3.4-1 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:8.3.4-2 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.3.4-1 app:rake gitlab:env:info + sameersbn/gitlab:8.3.4-2 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.3.4-1 app:rake gitlab:import:repos + sameersbn/gitlab:8.3.4-2 app:rake gitlab:import:repos ``` Or @@ -1002,12 +1002,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure > **Note** > -> Upgrading to `sameersbn/gitlab:8.3.4-1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher. +> Upgrading to `sameersbn/gitlab:8.3.4-2` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher. - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab:8.3.4-1 +docker pull sameersbn/gitlab:8.3.4-2 ``` - **Step 2**: Stop and remove the currently running image @@ -1031,7 +1031,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.3.4-1 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:8.3.4-2 ``` ## Shell Access diff --git a/VERSION b/VERSION index 8a78c263..7ee0ef09 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.3.4-1 +8.3.4-2 diff --git a/docker-compose.yml b/docker-compose.yml index 8653d3f2..7edc2975 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.3.4-1 + image: sameersbn/gitlab:8.3.4-2 links: - redis:redisio - postgresql:postgresql diff --git a/kubernetes/gitlab.yml b/kubernetes/gitlab.yml index d615d8ce..9dca8d58 100644 --- a/kubernetes/gitlab.yml +++ b/kubernetes/gitlab.yml @@ -7,7 +7,7 @@ metadata: spec: containers: - name: gitlab - image: sameersbn/gitlab:8.3.4-1 + image: sameersbn/gitlab:8.3.4-2 env: - name: TZ value: Asia/Kolkata