Skip to content

Commit

Permalink
release 7.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Sameer Naik committed Dec 24, 2014
1 parent d1428a0 commit 81f46ca
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

**latest**
**7.6.1**
- disable nginx ipv6 if host does not support it.
- init: added GITLAB_BACKUP_TIME configuration option
- gitlab: upgrade to CE v.7.6.1
Expand Down
52 changes: 26 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Dockerfile to build a GitLab container image.

## Version

Current Version: **7.6.0**
Current Version: **7.6.1**

# Hardware Requirements

Expand Down Expand Up @@ -141,7 +141,7 @@ In your issue report please make sure you provide the following information:
Pull the image from the docker index. This is the recommended method of installation as it is easier to update image. These builds are performed by the **Docker Trusted Build** service.

```bash
docker pull sameersbn/gitlab:7.6.0
docker pull sameersbn/gitlab:7.6.1
```

You can also pull the `latest` tag which is built from the repository *HEAD*
Expand All @@ -168,7 +168,7 @@ docker run --name='gitlab' -it --rm \
-p 10022:22 -p 10080:80 \
-v /var/run/docker.sock:/run/docker.sock \
-v $(which docker):/bin/docker \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.6.1
```

Or you can use [fig](http://www.fig.sh/). Assuming you have fig installed,
Expand Down Expand Up @@ -209,7 +209,7 @@ Volumes can be mounted in docker by specifying the **'-v'** option in the docker
```bash
docker run --name=gitlab -d \
-v /opt/gitlab/data:/home/git/data \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.6.1
```

## Database
Expand Down Expand Up @@ -260,7 +260,7 @@ We are now ready to start the GitLab application.
docker run --name=gitlab -d \
-e 'DB_HOST=192.168.1.100' -e 'DB_NAME=gitlabhq_production' -e 'DB_USER=gitlab' -e 'DB_PASS=password' \
-v /opt/gitlab/data:/home/git/data \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.6.1
```

#### Linking to MySQL Container
Expand Down Expand Up @@ -302,7 +302,7 @@ We are now ready to start the GitLab application.
```bash
docker run --name=gitlab -d --link mysql:mysql \
-v /opt/gitlab/data:/home/git/data \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.6.1
```

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:
Expand Down Expand Up @@ -330,7 +330,7 @@ We are now ready to start the GitLab application.
docker run --name=gitlab -d \
-e 'DB_TYPE=postgres' -e 'DB_HOST=192.168.1.100' -e 'DB_NAME=gitlabhq_production' -e 'DB_USER=gitlab' -e 'DB_PASS=password' \
-v /opt/gitlab/data:/home/git/data \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.6.1
```

#### Linking to PostgreSQL Container
Expand Down Expand Up @@ -372,7 +372,7 @@ We are now ready to start the GitLab application.
```bash
docker run --name=gitlab -d --link postgresql:postgresql \
-v /opt/gitlab/data:/home/git/data \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.6.1
```

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:
Expand All @@ -397,7 +397,7 @@ The image can be configured to use an external redis server instead of starting
```bash
docker run --name=gitlab -it --rm \
-e 'REDIS_HOST=192.168.1.100' -e 'REDIS_PORT=6379' \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.6.1
```

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

```bash
docker run --name=gitlab -d --link redis:redisio \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.6.1
```

### Mail
Expand All @@ -435,7 +435,7 @@ Please refer the [Available Configuration Parameters](#available-configuration-p
docker run --name=gitlab -d \
-e 'SMTP_USER=USER@gmail.com' -e 'SMTP_PASS=PASSWORD' \
-v /opt/gitlab/data:/home/git/data \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.6.1
```

### SSL
Expand Down Expand Up @@ -508,7 +508,7 @@ HTTPS support can be enabled by setting the `GITLAB_HTTPS` option to `true`. Add
docker run --name=gitlab -d \
-e 'GITLAB_HTTPS=true' -e 'SSL_SELF_SIGNED=true' \
-v /opt/gitlab/data:/home/git/data \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.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 @@ -524,7 +524,7 @@ docker run --name=gitlab -d \
-e 'GITLAB_HTTPS=true' -e 'SSL_SELF_SIGNED=true' \
-e 'GITLAB_HTTPS_HSTS_MAXAGE=2592000'
-v /opt/gitlab/data:/home/git/data \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.6.1
```

If you want to completely disable HSTS set `GITLAB_HTTPS_HSTS_ENABLED` to `false`.
Expand All @@ -546,7 +546,7 @@ docker run --name=gitlab -d -p 10022:22 -p 10080:80 \
-e 'GITLAB_SSH_PORT=10022' -e 'GITLAB_PORT=443' \
-e 'GITLAB_HTTPS=true' -e 'SSL_SELF_SIGNED=true' \
-v /opt/gitlab/data:/home/git/data \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.6.1
```

Again, drop the `-e 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
Expand Down Expand Up @@ -590,7 +590,7 @@ Let's assume we want to deploy our application to '/git'. GitLab needs to know t
docker run --name=gitlab -it --rm \
-e 'GITLAB_RELATIVE_URL_ROOT=/git' \
-v /opt/gitlab/data:/home/git/data \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.6.1
```

GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
Expand All @@ -605,7 +605,7 @@ docker run --name=gitlab -d -h git.local.host \
-v /opt/gitlab/mysql:/var/lib/mysql \
-e 'GITLAB_HOST=git.local.host' -e 'GITLAB_EMAIL=gitlab@local.host' \
-e 'SMTP_USER=USER@gmail.com' -e 'SMTP_PASS=PASSWORD' \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.6.1
```

If you are using an external mysql database
Expand All @@ -616,7 +616,7 @@ docker run --name=gitlab -d -h git.local.host \
-e 'DB_HOST=192.168.1.100' -e 'DB_NAME=gitlabhq_production' -e 'DB_USER=gitlab' -e 'DB_PASS=password' \
-e 'GITLAB_HOST=git.local.host' -e 'GITLAB_EMAIL=gitlab@local.host' \
-e 'SMTP_USER=USER@gmail.com' -e 'SMTP_PASS=PASSWORD' \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.6.1
```

### OmniAuth Integration
Expand Down Expand Up @@ -680,14 +680,14 @@ Also the container processes seem to be executed as the host's user/group `1000`
```bash
docker run --name=gitlab -it --rm [options] \
-e "USERMAP_UID=$(id -u git)" -e "USERMAP_GID=$(id -g git)" \
sameersbn/gitlab:7.6.0
sameersbn/gitlab:7.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:7.6.0 app:sanitize
sameersbn/gitlab:7.6.1 app:sanitize
```

### Piwik
Expand Down Expand Up @@ -801,7 +801,7 @@ To take a backup all you need to do is run the gitlab rake task to create a back

```bash
docker run --name=gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:7.6.0 app:rake gitlab:backup:create
sameersbn/gitlab:7.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 that behavior by setting your own path within the container. To do so you have to pass the argument `-e "GITLAB_BACKUP_DIR:/path/to/backups"` to the docker run command.
Expand All @@ -818,7 +818,7 @@ To restore a backup, run the image in interactive (-it) mode and pass the "app:r

```bash
docker run --name=gitlab -it --rm [OPTIONS] \
sameersbn/gitlab:7.6.0 app:rake gitlab:backup:restore
sameersbn/gitlab:7.6.1 app:rake gitlab:backup:restore
```

The restore operation will list all available backups in reverse chronological order. Select the backup you want to restore and gitlab will do its job.
Expand All @@ -827,7 +827,7 @@ To avoid user interaction in the restore operation, you can specify the timestam

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

## Automated Backups
Expand Down Expand Up @@ -873,7 +873,7 @@ To upgrade to newer gitlab releases, simply follow this 4 step upgrade procedure
- **Step 1**: Update the docker image.

```bash
docker pull sameersbn/gitlab:7.6.0
docker pull sameersbn/gitlab:7.6.1
```

- **Step 2**: Stop and remove the currently running image
Expand All @@ -895,7 +895,7 @@ Replace **xx.xx.xx** with the version you are upgrading from. For example, if yo
- **Step 4**: Start the image

```bash
docker run --name=gitlab -d [OPTIONS] sameersbn/gitlab:7.6.0
docker run --name=gitlab -d [OPTIONS] sameersbn/gitlab:7.6.1
```

## Rake Tasks
Expand All @@ -904,14 +904,14 @@ The `app:rake` command allows you to run gitlab rake tasks. To run a rake task s

```bash
docker run --name=gitlab -d [OPTIONS] \
sameersbn/gitlab:7.6.0 app:rake gitlab:env:info
sameersbn/gitlab:7.6.1 app:rake gitlab:env:info
```

Similarly, to import bare repositories into GitLab project instance

```bash
docker run --name=gitlab -d [OPTIONS] \
sameersbn/gitlab:7.6.0 app:rake gitlab:import:repos
sameersbn/gitlab:7.6.1 app:rake gitlab:import:repos
```

For a complete list of available rake tasks please refer https://github.com/gitlabhq/gitlabhq/tree/master/doc/raketasks or the help section of your gitlab installation.
Expand Down
2 changes: 1 addition & 1 deletion fig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ postgresql:
- DB_PASS=secretpassword
- DB_NAME=gitlabhq_production
gitlab:
image: sameersbn/gitlab:7.6.0
image: sameersbn/gitlab:7.6.1
links:
- redis:redisio
- postgresql:postgresql
Expand Down

0 comments on commit 81f46ca

Please sign in to comment.