diff --git a/Changelog.md b/Changelog.md index 4db3d74..60b25c6 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 CI [CHANGELOG](https://github.com/gitlabhq/gitlab-ci/blob/master/CHANGELOG) for the list of changes in GitLab CI. -**latest** +**7.13.4** - gitlab-ci: upgrade to v.7.13.4 **7.13.3** diff --git a/README.md b/README.md index 7d74487..75adacd 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# sameersbn/gitlab-ci:7.13.3 +# sameersbn/gitlab-ci:7.13.4 - [Introduction](#introduction) - [Version](#version) @@ -49,7 +49,7 @@ Dockerfile to build a [GitLab CI](https://about.gitlab.com/gitlab-ci/) container ## Version -Current Version: `7.13.3` +Current Version: `7.13.4` *The gitlab-ci version should match the gitlab version to avoid any compatibility issues* @@ -100,7 +100,7 @@ docker pull sameersbn/gitlab-ci:latest Starting from GitLab CI version `5.1.0`, You can pull a particular version of GitLab CI by specifying the version number. For example, ```bash -docker pull sameersbn/gitlab-ci:7.13.3 +docker pull sameersbn/gitlab-ci:7.13.4 ``` Alternately you can build the image yourself. @@ -115,7 +115,7 @@ docker build --tag $USER/gitlab-ci . Before you can start the GitLab CI image you need to make sure you have a [GitLab](https://www.gitlab.com/) server running. Checkout the [docker-gitlab](https://github.com/sameersbn/docker-gitlab) project for getting a GitLab server up and running. -You need to provide the URL of the GitLab server while running GitLab CI using the `GITLAB_URL` environment configuration. Since version `5.4.0` you need to provide the `GITLAB_APP_ID` and `GITLAB_APP_SECRET`. Since `7.13.3` you also need to provide the `GITLAB_CI_SECRETS_SESSION_KEY_BASE` and `GITLAB_CI_SECRETS_DB_KEY_BASE` parameters. +You need to provide the URL of the GitLab server while running GitLab CI using the `GITLAB_URL` environment configuration. Since version `5.4.0` you need to provide the `GITLAB_APP_ID` and `GITLAB_APP_SECRET`. Since `7.13.4` you also need to provide the `GITLAB_CI_SECRETS_SESSION_KEY_BASE` and `GITLAB_CI_SECRETS_DB_KEY_BASE` parameters. The quickest way to get started is using [docker-compose](https://docs.docker.com/compose/). @@ -153,7 +153,7 @@ docker run --name gitlab-ci -d \ --env 'GITLAB_CI_PORT=10081' --env 'GITLAB_URL=http://localhost:10080' \ --env 'GITLAB_APP_ID=xxx' --env 'GITLAB_APP_SECRET=yyy' \ --volume /srv/docker/gitlab-ci/gitlab-ci:/home/gitlab_ci/data \ - sameersbn/gitlab-ci:7.13.3 + sameersbn/gitlab-ci:7.13.4 ``` Point your browser to `http://localhost:10081` and login using your GitLab credentials. @@ -184,7 +184,7 @@ Volumes can be mounted in docker by specifying the **'-v'** option in the docker ```bash docker run --name gitlab-ci -it --rm \ --volume /srv/docker/gitlab-ci/gitlab-ci:/home/gitlab_ci/data \ - sameersbn/gitlab-ci:7.13.3 + sameersbn/gitlab-ci:7.13.4 ``` ## Database @@ -214,7 +214,7 @@ docker run --name gitlab-ci -it --rm \ --env 'DB_TYPE=postgres' --env 'DB_HOST=192.168.1.100' \ --env 'DB_NAME=gitlab_ci_production' \ --env 'DB_USER=gitlab_ci' --env 'DB_PASS=password' \ - sameersbn/gitlab-ci:7.13.3 + sameersbn/gitlab-ci:7.13.4 ``` #### Linking to PostgreSQL Container @@ -258,7 +258,7 @@ We are now ready to start the GitLab CI application. docker run --name gitlab-ci -it --rm --link gitlab-ci-postgresql:postgresql \ --env 'GITLAB_URL=http://172.17.0.2' \ --env 'GITLAB_APP_ID=xxx' --env 'GITLAB_APP_SECRET=yyy' \ - sameersbn/gitlab-ci:7.13.3 + sameersbn/gitlab-ci:7.13.4 ``` 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: @@ -312,7 +312,7 @@ docker run --name gitlab-ci -it --rm \ --env 'GITLAB_APP_ID=xxx' --env 'GITLAB_APP_SECRET=yyy' \ --env 'DB_HOST=192.168.1.100' --env 'DB_NAME=gitlab_ci_production' \ --env 'DB_USER=gitlab_ci' --env 'DB_PASS=password' \ - sameersbn/gitlab-ci:7.13.3 + sameersbn/gitlab-ci:7.13.4 ``` #### Linking to MySQL Container @@ -356,7 +356,7 @@ We are now ready to start the GitLab CI application. docker run --name gitlab-ci -it --rm --link gitlab-ci-mysql:mysql \ --env 'GITLAB_URL=http://172.17.0.2' \ --env 'GITLAB_APP_ID=xxx' --env 'GITLAB_APP_SECRET=yyy' \ - sameersbn/gitlab-ci:7.13.3 + sameersbn/gitlab-ci:7.13.4 ``` 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: @@ -383,7 +383,7 @@ The image can be configured to use an external redis server instead of starting ```bash docker run --name gitlab-ci -it --rm \ --env 'REDIS_HOST=192.168.1.100' --env 'REDIS_PORT=6379' \ - sameersbn/gitlab-ci:7.13.3 + sameersbn/gitlab-ci:7.13.4 ``` ### Linking to Redis Container @@ -420,7 +420,7 @@ Please refer the [Available Configuration Parameters](#available-configuration-p ```bash docker run --name gitlab-ci -it --rm \ --env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \ - sameersbn/gitlab-ci:7.13.3 + sameersbn/gitlab-ci:7.13.4 ``` Please look up the [Available Configuration Parameters](#available-configuration-parameters) section for all available SMTP configuration options. @@ -498,7 +498,7 @@ docker run --name gitlab-ci -it --rm \ --publish 10081:80 --publish 10444:443 \ --env 'GITLAB_CI_PORT=10444' -env 'GITLAB_CI_HTTPS=true' \ --volume /srv/docker/gitlab-ci/gitlab-ci:/home/gitlab_ci/data \ - sameersbn/gitlab-ci:7.13.3 + sameersbn/gitlab-ci:7.13.4 ``` 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. @@ -514,7 +514,7 @@ docker run --name gitlab-ci -it --rm \ --env 'GITLAB_CI_HTTPS=true' \ --env 'GITLAB_CI_HTTPS_HSTS_MAXAGE=2592000' \ --volume /srv/docker/gitlab-ci/gitlab-ci:/home/gitlab_ci/data \ - sameersbn/gitlab-ci:7.13.3 + sameersbn/gitlab-ci:7.13.4 ``` If you want to completely disable HSTS set `GITLAB_CI_HTTPS_HSTS_ENABLED` to `false`. @@ -533,7 +533,7 @@ In summation, when using a load balancer, the docker command would look for the docker run --name gitlab-ci -it --rm \ --env 'GITLAB_CI_HTTPS=true' \ --volume /srv/docker/gitlab-ci/gitlab-ci:/home/gitlab_ci/data \ - sameersbn/gitlab-ci:7.13.3 + sameersbn/gitlab-ci:7.13.4 ``` #### Establishing trust with your server @@ -570,7 +570,7 @@ Let's assume we want to deploy our application to '/ci'. GitLab CI needs to know docker run --name gitlab-ci -it --rm \ --env 'GITLAB_CI_RELATIVE_URL_ROOT=/ci' \ --volume /srv/docker/gitlab-ci/gitlab-ci:/home/gitlab_ci/data \ - sameersbn/gitlab-ci:7.13.3 + sameersbn/gitlab-ci:7.13.4 ``` GitLab CI will now be accessible at the `/ci` path, e.g. `http://www.example.com/ci`. @@ -656,7 +656,7 @@ Execute the rake task to create a backup. ```bash docker run --name gitlab-ci -it --rm [OPTIONS] \ - sameersbn/gitlab-ci:7.13.3 app:rake backup:create + sameersbn/gitlab-ci:7.13.4 app:rake backup:create ``` A backup will be created in the backups folder of the [Persistence](#persistence). You can change the location of the backups using the `GITLAB_CI_BACKUP_DIR` configuration parameter. @@ -677,7 +677,7 @@ Execute the rake task to restore a backup. Make sure you run the container in in ```bash docker run --name gitlab-ci -it --rm [OPTIONS] \ - sameersbn/gitlab-ci:7.13.3 app:rake backup:restore + sameersbn/gitlab-ci:7.13.4 app:rake backup:restore ``` The list of all available backups will be displayed in reverse chronological order. Select the backup you want to restore and continue. @@ -686,7 +686,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the ```bash docker run --name gitlab-ci -it --rm [OPTIONS] \ - sameersbn/gitlab-ci:7.13.3 app:rake backup:restore BACKUP=1417624827 + sameersbn/gitlab-ci:7.13.4 app:rake backup:restore BACKUP=1417624827 ``` ## Automated Backups @@ -712,7 +712,7 @@ To upgrade to newer GitLab CI releases, simply follow this 3 step upgrade proced - **Step 1**: Update the docker image. ```bash -docker pull sameersbn/gitlab-ci:7.13.3 +docker pull sameersbn/gitlab-ci:7.13.4 ``` - **Step 2**: Stop and remove the currently running image @@ -725,7 +725,7 @@ docker rm gitlab-ci - **Step 3**: Start the image ```bash -docker run --name gitlab-ci -d [OPTIONS] sameersbn/gitlab-ci:7.13.3 +docker run --name gitlab-ci -d [OPTIONS] sameersbn/gitlab-ci:7.13.4 ``` ## Shell Access diff --git a/VERSION b/VERSION index 11ad874..0726d55 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.13.3 +7.13.4 diff --git a/docker-compose.yml b/docker-compose.yml index e15b941..425ac9a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ redis: volumes: - /srv/docker/gitlab-ci/redis:/var/lib/redis ci: - image: sameersbn/gitlab-ci:7.13.3 + image: sameersbn/gitlab-ci:7.13.4 links: - redis:redisio - postgresql:postgresql