diff --git a/Changelog.md b/Changelog.md index b56507deb..f385e96d2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,7 +2,7 @@ This file only reflects the changes that are made in the the docker image. Please refer to the upstream GitLab [CHANGELOG](https://github.com/gitlabhq/gitlabhq/blob/master/CHANGELOG) for the list of changes in GitLab. -**latest** +**7.14.3** - gitlab: upgrade to CE v.7.14.3 **7.14.2** diff --git a/README.md b/README.md index 85b2efce5..55f28bb58 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Deploy to Tutum](https://s.tutum.co/deploy-to-tutum.svg)](https://dashboard.tutum.co/stack/deploy/) -# sameersbn/gitlab:7.14.2 +# sameersbn/gitlab:7.14.3 - [Introduction](#introduction) - [Version](#version) @@ -63,7 +63,7 @@ Dockerfile to build a [GitLab](https://about.gitlab.com/) container image. ## Version -Current Version: `7.14.2` +Current Version: `7.14.3` # Contributing @@ -112,7 +112,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas 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.14.2 +docker pull sameersbn/gitlab:7.14.3 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -166,7 +166,7 @@ docker run --name gitlab -d \ --publish 10022:22 --publish 10080:80 \ --env 'GITLAB_PORT=10080' --env 'GITLAB_SSH_PORT=10022' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ -sameersbn/gitlab:7.14.2 +sameersbn/gitlab:7.14.3 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -202,7 +202,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:7.14.2 + sameersbn/gitlab:7.14.3 ``` ## Database @@ -233,7 +233,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:7.14.2 + sameersbn/gitlab:7.14.3 ``` #### Linking to PostgreSQL Container @@ -276,7 +276,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:7.14.2 + sameersbn/gitlab:7.14.3 ``` 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: @@ -329,7 +329,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:7.14.2 + sameersbn/gitlab:7.14.3 ``` #### Linking to MySQL Container @@ -372,7 +372,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:7.14.2 + sameersbn/gitlab:7.14.3 ``` 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: @@ -399,7 +399,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:7.14.2 + sameersbn/gitlab:7.14.3 ``` ### Linking to Redis Container @@ -426,7 +426,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - sameersbn/gitlab:7.14.2 + sameersbn/gitlab:7.14.3 ``` ### Mail @@ -439,7 +439,7 @@ Please refer the [Available Configuration Parameters](#available-configuration-p docker run --name gitlab -d \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ --volume /srv/docker/gitlab/gitlab:/home/git/data \ - sameersbn/gitlab:7.14.2 + sameersbn/gitlab:7.14.3 ``` ### SSL @@ -514,7 +514,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:7.14.2 + sameersbn/gitlab:7.14.3 ``` 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. @@ -530,7 +530,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:7.14.2 + sameersbn/gitlab:7.14.3 ``` If you want to completely disable HSTS set `GITLAB_HTTPS_HSTS_ENABLED` to `false`. @@ -553,7 +553,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:7.14.2 + sameersbn/gitlab:7.14.3 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -601,7 +601,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:7.14.2 + sameersbn/gitlab:7.14.3 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -666,7 +666,7 @@ Please refer to [Available Configuration Parameters](#available-configuration-pa ### External Issue Trackers -Since version `7.14.2` support for external issue trackers can be enabled in the "Service Templates" section of the settings panel. +Since version `7.14.3` support for external issue trackers can be enabled in the "Service Templates" section of the settings panel. If you are using the [docker-redmine](https://github.com/sameersbn/docker-redmine) image, you can *one up* the gitlab integration with redmine by adding `--volumes-from=gitlab` flag to the docker run command while starting the redmine container. @@ -681,14 +681,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:7.14.2 + sameersbn/gitlab:7.14.3 ``` 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.14.2 app:sanitize + sameersbn/gitlab:7.14.3 app:sanitize ``` ### Piwik @@ -838,7 +838,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:7.14.2 app:rake gitlab:backup:create + sameersbn/gitlab:7.14.3 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. @@ -859,7 +859,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:7.14.2 app:rake gitlab:backup:restore + sameersbn/gitlab:7.14.3 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. @@ -868,7 +868,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - sameersbn/gitlab:7.14.2 app:rake gitlab:backup:restore BACKUP=1417624827 + sameersbn/gitlab:7.14.3 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Automated Backups @@ -893,7 +893,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:7.14.2 app:rake gitlab:env:info + sameersbn/gitlab:7.14.3 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -906,7 +906,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -d [OPTIONS] \ - sameersbn/gitlab:7.14.2 app:rake gitlab:import:repos + sameersbn/gitlab:7.14.3 app:rake gitlab:import:repos ``` Or @@ -928,7 +928,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.14.2 +docker pull sameersbn/gitlab:7.14.3 ``` - **Step 2**: Stop and remove the currently running image @@ -950,7 +950,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are - **Step 4**: Start the image ```bash -docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:7.14.2 +docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:7.14.3 ``` ## Shell Access diff --git a/VERSION b/VERSION index 4f43a44be..663712d2e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.14.2 +7.14.3 diff --git a/docker-compose.yml b/docker-compose.yml index dabd19fff..890588c7a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ postgresql: volumes: - /srv/docker/gitlab/postgresql:/var/lib/postgresql gitlab: - image: sameersbn/gitlab:7.14.2 + image: sameersbn/gitlab:7.14.3 links: - redis:redisio - postgresql:postgresql