Skip to content

Commit

Permalink
release 8.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Sameer Naik committed Mar 27, 2016
1 parent 253f495 commit dc5a631
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Changelog.md
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 this image. Please refer to the upstream GitLab [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) for the list of changes in GitLab.

**latest**
**8.6.1**
- gitlab: upgrade to CE v8.6.1

**8.6.0**
Expand Down
52 changes: 26 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[![Deploy to Tutum](https://s.tutum.co/deploy-to-tutum.svg)](https://dashboard.tutum.co/stack/deploy/)

# sameersbn/gitlab:8.6.0
# sameersbn/gitlab:8.6.1

- [Introduction](#introduction)
- [Changelog](Changelog.md)
Expand Down Expand Up @@ -111,7 +111,7 @@ Automated builds of the image are available on [Dockerhub](https://hub.docker.co
> **Note**: Builds are also available on [Quay.io](https://quay.io/repository/sameersbn/gitlab)
```bash
docker pull sameersbn/gitlab:8.6.0
docker pull sameersbn/gitlab:8.6.1
```

You can also pull the `latest` tag which is built from the repository *HEAD*
Expand Down Expand Up @@ -174,7 +174,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 \
sameersbn/gitlab:8.6.0
sameersbn/gitlab:8.6.1
```

*Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
Expand Down Expand Up @@ -209,7 +209,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:8.6.0
sameersbn/gitlab:8.6.1
```

## Database
Expand Down Expand Up @@ -242,7 +242,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:8.6.0
sameersbn/gitlab:8.6.1
```

#### Linking to PostgreSQL Container
Expand Down Expand Up @@ -286,7 +286,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:8.6.0
sameersbn/gitlab:8.6.1
```

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 @@ -340,7 +340,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:8.6.0
sameersbn/gitlab:8.6.1
```

#### Linking to MySQL Container
Expand Down Expand Up @@ -383,7 +383,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:8.6.0
sameersbn/gitlab:8.6.1
```

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 @@ -410,7 +410,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:8.6.0
sameersbn/gitlab:8.6.1
```

### Linking to Redis Container
Expand All @@ -437,7 +437,7 @@ We are now ready to start the GitLab application.

```bash
docker run --name gitlab -d --link gitlab-redis:redisio \
sameersbn/gitlab:8.6.0
sameersbn/gitlab:8.6.1
```

### Mail
Expand Down Expand Up @@ -467,7 +467,7 @@ If you are using Gmail then all you need to do is:
docker run --name gitlab -d \
--env '[email protected]' --env 'IMAP_PASS=PASSWORD' \
--volume /srv/docker/gitlab/gitlab:/home/git/data \
sameersbn/gitlab:8.6.0
sameersbn/gitlab:8.6.1
```

Please refer the [Available Configuration Parameters](#available-configuration-parameters) section for the list of IMAP parameters that can be specified.
Expand Down Expand Up @@ -544,7 +544,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:8.6.0
sameersbn/gitlab:8.6.1
```

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 @@ -560,7 +560,7 @@ docker run --name gitlab -d \
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
--env 'NGINX_HSTS_MAXAGE=2592000' \
--volume /srv/docker/gitlab/gitlab:/home/git/data \
sameersbn/gitlab:8.6.0
sameersbn/gitlab:8.6.1
```

If you want to completely disable HSTS set `NGINX_HSTS_ENABLED` to `false`.
Expand All @@ -583,7 +583,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:8.6.0
sameersbn/gitlab:8.6.1
```

Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
Expand Down Expand Up @@ -631,7 +631,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:8.6.0
sameersbn/gitlab:8.6.1
```

GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
Expand Down Expand Up @@ -747,14 +747,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:8.6.0
sameersbn/gitlab:8.6.1
```

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:8.6.0 app:sanitize
sameersbn/gitlab:8.6.1 app:sanitize
```

### Piwik
Expand Down Expand Up @@ -955,7 +955,7 @@ Execute the rake task to create a backup.

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:8.6.0 app:rake gitlab:backup:create
sameersbn/gitlab:8.6.1 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.
Expand All @@ -976,7 +976,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:8.6.0 app:rake gitlab:backup:restore
sameersbn/gitlab:8.6.1 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.
Expand All @@ -985,7 +985,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:8.6.0 app:rake gitlab:backup:restore BACKUP=1417624827
sameersbn/gitlab:8.6.1 app:rake gitlab:backup:restore BACKUP=1417624827
```

## Automated Backups
Expand All @@ -1010,7 +1010,7 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:8.6.0 app:rake gitlab:env:info
sameersbn/gitlab:8.6.1 app:rake gitlab:env:info
```

You can also use `docker exec` to run raketasks on running gitlab instance. For example,
Expand All @@ -1023,7 +1023,7 @@ Similarly, to import bare repositories into GitLab project instance

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:8.6.0 app:rake gitlab:import:repos
sameersbn/gitlab:8.6.1 app:rake gitlab:import:repos
```

Or
Expand All @@ -1042,7 +1042,7 @@ Copy all the **bare** git repositories to the `repositories/` directory of the [

```bash
docker run --name gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:8.6.0 app:rake gitlab:import:repos
sameersbn/gitlab:8.6.1 app:rake gitlab:import:repos
```

Watch the logs and your repositories should be available into your new gitlab container.
Expand All @@ -1057,12 +1057,12 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure

> **Note**
>
> Upgrading to `sameersbn/gitlab:8.6.0` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
> Upgrading to `sameersbn/gitlab:8.6.1` from `sameersbn/gitlab:7.x.x` can cause issues. It is therefore required that you first upgrade to `sameersbn/gitlab:8.0.5-1` before upgrading to `sameersbn/gitlab:8.1.0` or higher.
- **Step 1**: Update the docker image.

```bash
docker pull sameersbn/gitlab:8.6.0
docker pull sameersbn/gitlab:8.6.1
```

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

## Shell Access
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.6.0
8.6.1
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ postgresql:
- /srv/docker/gitlab/postgresql:/var/lib/postgresql
gitlab:
restart: always
image: sameersbn/gitlab:8.6.0
image: sameersbn/gitlab:8.6.1
links:
- redis:redisio
- postgresql:postgresql
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/gitlab.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
spec:
containers:
- name: gitlab
image: sameersbn/gitlab:8.6.0
image: sameersbn/gitlab:8.6.1
env:
- name: TZ
value: Asia/Kolkata
Expand Down

0 comments on commit dc5a631

Please sign in to comment.