Skip to content

Commit

Permalink
release 7.13.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Sameer Naik committed Aug 5, 2015
1 parent 278c4ea commit 1ca1534
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion Changelog.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.3**
- gitlab-ci: upgrade to v.7.13.3

**7.13.2**
Expand Down
42 changes: 21 additions & 21 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# sameersbn/gitlab-ci:7.13.2
# sameersbn/gitlab-ci:7.13.3

- [Introduction](#introduction)
- [Version](#version)
Expand Down Expand Up @@ -49,7 +49,7 @@ Dockerfile to build a [GitLab CI](https://about.gitlab.com/gitlab-ci/) container

## Version

Current Version: `7.13.2`
Current Version: `7.13.3`

*The gitlab-ci version should match the gitlab version to avoid any compatibility issues*

Expand Down Expand Up @@ -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.2
docker pull sameersbn/gitlab-ci:7.13.3
```

Alternately you can build the image yourself.
Expand All @@ -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.2` 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.3` 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/).

Expand Down Expand Up @@ -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.2
sameersbn/gitlab-ci:7.13.3
```

Point your browser to `http://localhost:10081` and login using your GitLab credentials.
Expand Down Expand Up @@ -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.2
sameersbn/gitlab-ci:7.13.3
```

## Database
Expand Down Expand Up @@ -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.2
sameersbn/gitlab-ci:7.13.3
```

#### Linking to PostgreSQL Container
Expand Down Expand Up @@ -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.2
sameersbn/gitlab-ci:7.13.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:
Expand Down Expand Up @@ -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.2
sameersbn/gitlab-ci:7.13.3
```

#### Linking to MySQL Container
Expand Down Expand Up @@ -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.2
sameersbn/gitlab-ci:7.13.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:
Expand All @@ -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.2
sameersbn/gitlab-ci:7.13.3
```

### Linking to Redis Container
Expand Down Expand Up @@ -420,7 +420,7 @@ Please refer the [Available Configuration Parameters](#available-configuration-p
```bash
docker run --name gitlab-ci -it --rm \
--env '[email protected]' --env 'SMTP_PASS=PASSWORD' \
sameersbn/gitlab-ci:7.13.2
sameersbn/gitlab-ci:7.13.3
```

Please look up the [Available Configuration Parameters](#available-configuration-parameters) section for all available SMTP configuration options.
Expand Down Expand Up @@ -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.2
sameersbn/gitlab-ci:7.13.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.
Expand All @@ -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.2
sameersbn/gitlab-ci:7.13.3
```

If you want to completely disable HSTS set `GITLAB_CI_HTTPS_HSTS_ENABLED` to `false`.
Expand All @@ -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.2
sameersbn/gitlab-ci:7.13.3
```

#### Establishing trust with your server
Expand Down Expand Up @@ -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.2
sameersbn/gitlab-ci:7.13.3
```

GitLab CI will now be accessible at the `/ci` path, e.g. `http://www.example.com/ci`.
Expand Down Expand Up @@ -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.2 app:rake backup:create
sameersbn/gitlab-ci:7.13.3 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.
Expand All @@ -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.2 app:rake backup:restore
sameersbn/gitlab-ci:7.13.3 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.
Expand All @@ -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.2 app:rake backup:restore BACKUP=1417624827
sameersbn/gitlab-ci:7.13.3 app:rake backup:restore BACKUP=1417624827
```

## Automated Backups
Expand All @@ -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.2
docker pull sameersbn/gitlab-ci:7.13.3
```

- **Step 2**: Stop and remove the currently running image
Expand All @@ -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.2
docker run --name gitlab-ci -d [OPTIONS] sameersbn/gitlab-ci:7.13.3
```

## Shell Access
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.13.2
7.13.3
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ redis:
volumes:
- /srv/docker/gitlab-ci/redis:/var/lib/redis
ci:
image: sameersbn/gitlab-ci:7.13.2
image: sameersbn/gitlab-ci:7.13.3
links:
- redis:redisio
- postgresql:postgresql
Expand Down

0 comments on commit 1ca1534

Please sign in to comment.