diff --git a/CI_MIGRATION.md b/CI_MIGRATION.md index 079ed6f2..97715028 100644 --- a/CI_MIGRATION.md +++ b/CI_MIGRATION.md @@ -63,11 +63,11 @@ Make a note of the backup archive `xxxxxxxxxx_gitlab_ci_backup.tar.gz` as it is CI `8.x.x` is only meant for the purpose of migrating to GitLab `8.0`. Here we need to upgrade to version `8.x.x` and generate a backup that will be imported into GitLab. -### Upgrade to `quay.io/sameersbn/gitlab-ci:8.0.4-1` +### Upgrade to `quay.io/sameersbn/gitlab-ci:8.0.5` ```bash docker run -it --rm [OPTIONS] \ - quay.io/sameersbn/gitlab-ci:8.0.4-1 app:init + quay.io/sameersbn/gitlab-ci:8.0.5 app:init ``` ### Create CI backup @@ -76,7 +76,7 @@ docker run -it --rm [OPTIONS] \ ```bash docker run -it --rm [OPTIONS] \ - quay.io/sameersbn/gitlab-ci:8.0.4-1 app:rake backup:create + quay.io/sameersbn/gitlab-ci:8.0.5 app:rake backup:create ``` Copy the generated backup archive `xxxxxxxxxx_gitlab_ci_backup.tar` into the `backups/` directory of the GitLab server. @@ -89,16 +89,16 @@ We are done with CI. If the rest of the migration goes was planned you will not ## Step 5 - Upgrade GitLab -Before we can upgrade to `quay.io/sameersbn/gitlab:8.0.4-3`, we need to assign the value of `GITLAB_CI_SECRETS_DB_KEY_BASE` (from CI) to `GITLAB_SECRETS_DB_KEY_BASE` in GitLab's environment. +Before we can upgrade to `quay.io/sameersbn/gitlab:8.0.5`, we need to assign the value of `GITLAB_CI_SECRETS_DB_KEY_BASE` (from CI) to `GITLAB_SECRETS_DB_KEY_BASE` in GitLab's environment. Next you also need to set the environment variable `GITLAB_CI_HOST` to the address of your CI server, eg. `ci.example.com`. This will make sure that your existing runners will be able to communicate to GitLab with the old url. -### Upgrade to `quay.io/sameersbn/gitlab:8.0.4-3` +### Upgrade to `quay.io/sameersbn/gitlab:8.0.5` ```bash docker run -it --rm [OPTIONS] \ --env GITLAB_CI_HOST=ci.example.com --env GITLAB_SECRETS_DB_KEY_BASE=xxxxxx \ - quay.io/sameersbn/gitlab:8.0.4-3 app:init + quay.io/sameersbn/gitlab:8.0.5 app:init ``` ### Migrate CI data @@ -106,7 +106,7 @@ docker run -it --rm [OPTIONS] \ ```bash docker run -it --rm [OPTIONS] \ --env GITLAB_CI_HOST=ci.example.com --env GITLAB_SECRETS_DB_KEY_BASE=xxxxxx \ - quay.io/sameersbn/gitlab:8.0.4-3 app:rake ci:migrate + quay.io/sameersbn/gitlab:8.0.5 app:rake ci:migrate ``` ## Step 6 - Fix DNS and reverse proxy configurations diff --git a/Changelog.md b/Changelog.md index 524fea59..de6d007a 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** +**8.0.5** - gitlab: upgrade to CE v.8.0.5 **8.0.4-2** diff --git a/README.md b/README.md index 37ce3250..b86d080f 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/) -# quay.io/sameersbn/gitlab:8.0.4-3 +# quay.io/sameersbn/gitlab:8.0.5 - [Introduction](#introduction) - [Version](#version) @@ -67,7 +67,7 @@ Dockerfile to build a [GitLab](https://about.gitlab.com/) container image. ## Version -Current Version: `8.0.4-3` +Current Version: `8.0.5` # Contributing @@ -116,7 +116,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas Automated builds of the image are available on [Quay.io](https://quay.io/repository/sameersbn/gitlab) and is the recommended method of installation. ```bash -docker pull quay.io/sameersbn/gitlab:8.0.4-3 +docker pull quay.io/sameersbn/gitlab:8.0.5 ``` You can also pull the `latest` tag which is built from the repository *HEAD* @@ -180,7 +180,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 \ - quay.io/sameersbn/gitlab:8.0.4-3 + quay.io/sameersbn/gitlab:8.0.5 ``` *Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options* @@ -216,7 +216,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 \ - quay.io/sameersbn/gitlab:8.0.4-3 + quay.io/sameersbn/gitlab:8.0.5 ``` ## Database @@ -247,7 +247,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 \ - quay.io/sameersbn/gitlab:8.0.4-3 + quay.io/sameersbn/gitlab:8.0.5 ``` #### Linking to PostgreSQL Container @@ -290,7 +290,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 \ - quay.io/sameersbn/gitlab:8.0.4-3 + quay.io/sameersbn/gitlab:8.0.5 ``` 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: @@ -343,7 +343,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 \ - quay.io/sameersbn/gitlab:8.0.4-3 + quay.io/sameersbn/gitlab:8.0.5 ``` #### Linking to MySQL Container @@ -386,7 +386,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 \ - quay.io/sameersbn/gitlab:8.0.4-3 + quay.io/sameersbn/gitlab:8.0.5 ``` 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: @@ -413,7 +413,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' \ - quay.io/sameersbn/gitlab:8.0.4-3 + quay.io/sameersbn/gitlab:8.0.5 ``` ### Linking to Redis Container @@ -440,7 +440,7 @@ We are now ready to start the GitLab application. ```bash docker run --name gitlab -d --link gitlab-redis:redisio \ - quay.io/sameersbn/gitlab:8.0.4-3 + quay.io/sameersbn/gitlab:8.0.5 ``` ### Mail @@ -470,7 +470,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 \ - quay.io/sameersbn/gitlab:8.0.4-3 + quay.io/sameersbn/gitlab:8.0.5 ``` Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of SMTP parameters that can be specified. @@ -547,7 +547,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 \ - quay.io/sameersbn/gitlab:8.0.4-3 + quay.io/sameersbn/gitlab:8.0.5 ``` 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. @@ -563,7 +563,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 \ - quay.io/sameersbn/gitlab:8.0.4-3 + quay.io/sameersbn/gitlab:8.0.5 ``` If you want to completely disable HSTS set `GITLAB_HTTPS_HSTS_ENABLED` to `false`. @@ -586,7 +586,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 \ - quay.io/sameersbn/gitlab:8.0.4-3 + quay.io/sameersbn/gitlab:8.0.5 ``` Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. @@ -634,7 +634,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 \ - quay.io/sameersbn/gitlab:8.0.4-3 + quay.io/sameersbn/gitlab:8.0.5 ``` GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. @@ -720,14 +720,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)" \ - quay.io/sameersbn/gitlab:8.0.4-3 + quay.io/sameersbn/gitlab:8.0.5 ``` 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] \ - quay.io/sameersbn/gitlab:8.0.4-3 app:sanitize + quay.io/sameersbn/gitlab:8.0.5 app:sanitize ``` ### Piwik @@ -895,7 +895,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab -it --rm [OPTIONS] \ - quay.io/sameersbn/gitlab:8.0.4-3 app:rake gitlab:backup:create + quay.io/sameersbn/gitlab:8.0.5 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. @@ -916,7 +916,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] \ - quay.io/sameersbn/gitlab:8.0.4-3 app:rake gitlab:backup:restore + quay.io/sameersbn/gitlab:8.0.5 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. @@ -925,7 +925,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab -it --rm [OPTIONS] \ - quay.io/sameersbn/gitlab:8.0.4-3 app:rake gitlab:backup:restore BACKUP=1417624827 + quay.io/sameersbn/gitlab:8.0.5 app:rake gitlab:backup:restore BACKUP=1417624827 ``` ## Automated Backups @@ -950,7 +950,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] \ - quay.io/sameersbn/gitlab:8.0.4-3 app:rake gitlab:env:info + quay.io/sameersbn/gitlab:8.0.5 app:rake gitlab:env:info ``` You can also use `docker exec` to run raketasks on running gitlab instance. For example, @@ -963,7 +963,7 @@ Similarly, to import bare repositories into GitLab project instance ```bash docker run --name gitlab -d [OPTIONS] \ - quay.io/sameersbn/gitlab:8.0.4-3 app:rake gitlab:import:repos + quay.io/sameersbn/gitlab:8.0.5 app:rake gitlab:import:repos ``` Or @@ -985,7 +985,7 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure - **Step 1**: Update the docker image. ```bash -docker pull quay.io/sameersbn/gitlab:8.0.4-3 +docker pull quay.io/sameersbn/gitlab:8.0.5 ``` - **Step 2**: Stop and remove the currently running image @@ -1009,7 +1009,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] quay.io/sameersbn/gitlab:8.0.4-3 +docker run --name gitlab -d [OPTIONS] quay.io/sameersbn/gitlab:8.0.5 ``` ## Shell Access diff --git a/VERSION b/VERSION index bfa86d7f..904be6d4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -8.0.4-3 +8.0.5 diff --git a/docker-compose.yml b/docker-compose.yml index 85aa70af..55280a25 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ postgresql: volumes: - /srv/docker/gitlab/postgresql:/var/lib/postgresql gitlab: - image: quay.io/sameersbn/gitlab:8.0.4-3 + image: quay.io/sameersbn/gitlab:8.0.5 links: - redis:redisio - postgresql:postgresql diff --git a/kubernetes/gitlab-controller.yml b/kubernetes/gitlab-controller.yml index 60344bae..1f9e5de8 100644 --- a/kubernetes/gitlab-controller.yml +++ b/kubernetes/gitlab-controller.yml @@ -15,7 +15,7 @@ spec: spec: containers: - name: gitlab - image: quay.io/sameersbn/gitlab:8.0.4-3 + image: quay.io/sameersbn/gitlab:8.0.5 env: - name: TZ value: Asia/Kolkata