diff --git a/README.md b/README.md index 8ce46b3..671eb8c 100644 --- a/README.md +++ b/README.md @@ -100,10 +100,10 @@ Pull the latest version of the image from the docker index. This is the recommen docker pull sameersbn/gitlab-ci:latest ``` -Starting from GitLab CI version `5.0.1-1`, You can pull a particular version of GitLab CI by specifying the version number. For example, +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:5.0.1-1 +docker pull sameersbn/gitlab-ci:5.1.0 ``` Alternately you can build the image yourself. @@ -125,7 +125,7 @@ docker run --name=gitlab-ci -it --rm \ -p 10080:80 -e 'GITLAB_URL=http://172.17.0.2' \ -v /var/run/docker.sock:/run/docker.sock \ -v $(which docker):/bin/docker \ - sameersbn/gitlab-ci:5.0.1-1 + sameersbn/gitlab-ci:5.1.0 ``` Alternately, if the GitLab and GitLab CI servers are running on the same host, you can take advantage of docker links. Lets consider that the GitLab server is running on the same host and has the name **gitlab**, then using docker links: @@ -135,7 +135,7 @@ docker run --name=gitlab-ci -it --rm \ -p 10080:80 --link gitlab:gitlab \ -v /var/run/docker.sock:/run/docker.sock \ -v $(which docker):/bin/docker \ -sameersbn/gitlab-ci:5.0.1-1 +sameersbn/gitlab-ci:5.1.0 ``` Point your browser to `http://localhost:10080` and login using your GitLab credentials. @@ -164,7 +164,7 @@ Volumes can be mounted in docker by specifying the **'-v'** option in the docker ```bash docker run --name=gitlab-ci -it --rm \ -v /opt/gitlab-ci/data:/home/gitlab_ci/data \ - sameersbn/gitlab-ci:5.0.1-1 + sameersbn/gitlab-ci:5.1.0 ``` ## Database @@ -214,7 +214,7 @@ docker run --name=gitlab-ci -it --rm \ -e 'GITLAB_URL=http://172.17.0.2' \ -e 'DB_HOST=192.168.1.100' -e 'DB_NAME=gitlab_ci_production' \ -e 'DB_USER=gitlab_ci' -e 'DB_PASS=password' \ - sameersbn/gitlab-ci:5.0.1-1 + sameersbn/gitlab-ci:5.1.0 ``` #### Linking to MySQL Container @@ -257,7 +257,7 @@ We are now ready to start the GitLab CI application. ```bash docker run --name=gitlab-ci -it --rm --link mysql:mysql \ -e 'GITLAB_URL=http://172.17.0.2' \ - sameersbn/gitlab-ci:5.0.1-1 + sameersbn/gitlab-ci:5.1.0 ``` The image will automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the mysql container using the magic of docker links and works with the following images: @@ -287,7 +287,7 @@ docker run --name=gitlab-ci -it --rm \ -e 'DB_TYPE=postgres' -e 'DB_HOST=192.168.1.100' \ -e 'DB_NAME=gitlab_ci_production' \ -e 'DB_USER=gitlab_ci' -e 'DB_PASS=password' \ - sameersbn/gitlab-ci:5.0.1-1 + sameersbn/gitlab-ci:5.1.0 ``` #### Linking to PostgreSQL Container @@ -330,7 +330,7 @@ We are now ready to start the GitLab CI application. ```bash docker run --name=gitlab-ci -it --rm --link postgresql:postgresql \ -e 'GITLAB_URL=http://172.17.0.2' \ - sameersbn/gitlab-ci:5.0.1-1 + sameersbn/gitlab-ci:5.1.0 ``` The image will automatically fetch the `DB_NAME`, `DB_USER` and `DB_PASS` variables from the postgresql container using the magic of docker links and works with the following images: @@ -355,7 +355,7 @@ The image can be configured to use an external redis server instead of starting ```bash docker run --name=gitlab-ci -it --rm \ -e 'REDIS_HOST=192.168.1.100' -e 'REDIS_PORT=6379' \ - sameersbn/gitlab-ci:5.0.1-1 + sameersbn/gitlab-ci:5.1.0 ``` ### Linking to Redis Container @@ -392,7 +392,7 @@ Please refer the [Available Configuration Parameters](#available-configuration-p ```bash docker run --name=gitlab-ci -it --rm \ -e 'SMTP_USER=USER@gmail.com' -e 'SMTP_PASS=PASSWORD' \ - sameersbn/gitlab-ci:5.0.1-1 + sameersbn/gitlab-ci:5.1.0 ``` Please look up the [Available Configuration Parameters](#available-configuration-parameters) section for all available SMTP configuration options. @@ -467,7 +467,7 @@ HTTPS support can be enabled by setting the `GITLAB_CI_HTTPS` option to `true`. docker run --name=gitlab-ci -it --rm \ -e 'GITLAB_CI_HTTPS=true' \ -v /opt/gitlab-ci/data:/home/gitlab_ci/data \ - sameersbn/gitlab-ci:5.0.1-1 + sameersbn/gitlab-ci:5.1.0 ``` 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. @@ -483,7 +483,7 @@ docker run --name=gitlab-ci -it --rm \ -e 'GITLAB_CI_HTTPS=true' \ -e 'GITLAB_CI_HTTPS_HSTS_MAXAGE=2592000' -v /opt/gitlab-ci/data:/home/gitlab_ci/data \ - sameersbn/gitlab-ci:5.0.1-1 + sameersbn/gitlab-ci:5.1.0 ``` If you want to completely disable HSTS set `GITLAB_CI_HTTPS_HSTS_ENABLED` to `false`. @@ -502,7 +502,7 @@ In summation, when using a load balancer, the docker command would look for the docker run --name=gitlab-ci -it --rm \ -e 'GITLAB_CI_HTTPS=true' \ -v /opt/gitlab-ci/data:/home/gitlab_ci/data \ - sameersbn/gitlab-ci:5.0.1-1 + sameersbn/gitlab-ci:5.1.0 ``` #### Establishing trust with your server @@ -539,7 +539,7 @@ Let's assume we want to deploy our application to '/ci'. GitLab CI needs to know docker run --name=gitlab-ci -it --rm \ -e 'GITLAB_CI_RELATIVE_URL_ROOT=/ci' \ -v /opt/gitlab-ci/data:/home/gitlab_ci/data \ - sameersbn/gitlab-ci:5.0.1-1 + sameersbn/gitlab-ci:5.1.0 ``` GitLab CI will now be accessible at the `/ci` path, e.g. `http://www.example.com/ci`. @@ -557,7 +557,7 @@ docker run --name=gitlab-ci -d -h gitlab-ci.local.host \ -e 'GITLAB_CI_EMAIL=gitlab@local.host' \ -e 'GITLAB_CI_SUPPORT=support@local.host' \ -e 'SMTP_USER=USER@gmail.com' -e 'SMTP_PASS=PASSWORD' \ - sameersbn/gitlab-ci:5.0.1-1 + sameersbn/gitlab-ci:5.1.0 ``` If you are using an external mysql database @@ -572,7 +572,7 @@ docker run --name=gitlab-ci -d -h gitlab-ci.local.host \ -e 'GITLAB_CI_EMAIL=gitlab@local.host' \ -e 'GITLAB_CI_SUPPORT=support@local.host' \ -e 'SMTP_USER=USER@gmail.com' -e 'SMTP_PASS=PASSWORD' \ - sameersbn/gitlab-ci:5.0.1-1 + sameersbn/gitlab-ci:5.1.0 ``` ### Available Configuration Parameters @@ -647,7 +647,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:5.0.1-1 +docker pull sameersbn/gitlab-ci:5.1.0 ``` - **Step 2**: Stop and remove the currently running image @@ -660,7 +660,7 @@ docker rm gitlab-ci - **Step 3**: Start the image ```bash -docker run --name=gitlab-ci -d [OPTIONS] sameersbn/gitlab-ci:5.0.1-1 +docker run --name=gitlab-ci -d [OPTIONS] sameersbn/gitlab-ci:5.1.0 ``` # References