-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Sameer Naik
committed
Oct 1, 2014
1 parent
5916058
commit e941db6
Showing
2 changed files
with
26 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,7 +60,7 @@ Dockerfile to build a GitLab container image. | |
|
||
## Version | ||
|
||
Current Version: **7.3.1-3** | ||
Current Version: **7.3.2** | ||
|
||
# Hardware Requirements | ||
|
||
|
@@ -136,7 +136,7 @@ docker pull sameersbn/gitlab:latest | |
Since version `6.3.0`, the image builds are being tagged. You can now pull a particular version of gitlab by specifying the version number. For example, | ||
|
||
```bash | ||
docker pull sameersbn/gitlab:7.3.1-3 | ||
docker pull sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
Alternately you can build the image yourself. | ||
|
@@ -157,7 +157,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.3.1-3 | ||
sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
__NOTE__: Please allow a couple of minutes for the GitLab application to start. | ||
|
@@ -189,7 +189,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.3.1-3 | ||
sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
## Database | ||
|
@@ -204,7 +204,7 @@ GitLab uses a database backend to store its data. You can configure this image t | |
|
||
The internal mysql server has been removed from the image. Please use a [linked mysql](#linking-to-mysql-container) container or specify a connection to a [external mysql](#external-mysql-server) server. | ||
|
||
If you have been using the internal mysql server then first take a backup of the application and then restore the backup after setting up a linked or external mysql server. *NOTE: the backup and restore has to be performed with the same version of the image and should be version `7.3.1-3` or lower* | ||
If you have been using the internal mysql server then first take a backup of the application and then restore the backup after setting up a linked or external mysql server. *NOTE: the backup and restore has to be performed with the same version of the image and should be version `7.3.2` or lower* | ||
|
||
#### External MySQL Server | ||
|
||
|
@@ -226,7 +226,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.3.1-3 | ||
sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
#### Linking to MySQL Container | ||
|
@@ -268,7 +268,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.3.1-3 | ||
sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
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: | ||
|
@@ -296,7 +296,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.3.1-3 | ||
sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
#### Linking to PostgreSQL Container | ||
|
@@ -338,7 +338,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.3.1-3 | ||
sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
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: | ||
|
@@ -363,7 +363,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.3.1-3 | ||
sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
### Linking to Redis Container | ||
|
@@ -388,7 +388,7 @@ We are now ready to start the GitLab application. | |
|
||
```bash | ||
docker run --name=gitlab -d --link redis:redisio \ | ||
sameersbn/gitlab:7.3.1-3 | ||
sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
|
@@ -410,7 +410,7 @@ The following environment variables need to be specified to get mail support to | |
docker run --name=gitlab -d \ | ||
-e '[email protected]' -e 'SMTP_PASS=PASSWORD' \ | ||
-v /opt/gitlab/data:/home/git/data \ | ||
sameersbn/gitlab:7.3.1-3 | ||
sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
### SSL | ||
|
@@ -483,7 +483,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.3.1-3 | ||
sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
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. | ||
|
@@ -499,7 +499,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.3.1-3 | ||
sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
If you want to completely disable HSTS set `GITLAB_HTTPS_HSTS_ENABLED` to `false`. | ||
|
@@ -521,7 +521,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.3.1-3 | ||
sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
Again, drop the `-e 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates. | ||
|
@@ -565,7 +565,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.3.1-3 | ||
sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`. | ||
|
@@ -580,7 +580,7 @@ docker run --name=gitlab -d -h git.local.host \ | |
-v /opt/gitlab/mysql:/var/lib/mysql \ | ||
-e 'GITLAB_HOST=git.local.host' -e '[email protected]' \ | ||
-e '[email protected]' -e 'SMTP_PASS=PASSWORD' \ | ||
sameersbn/gitlab:7.3.1-3 | ||
sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
If you are using an external mysql database | ||
|
@@ -591,7 +591,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 '[email protected]' \ | ||
-e '[email protected]' -e 'SMTP_PASS=PASSWORD' \ | ||
sameersbn/gitlab:7.3.1-3 | ||
sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
### OmniAuth Integration | ||
|
@@ -737,7 +737,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.3.1-3 app:rake gitlab:backup:create | ||
sameersbn/gitlab:7.3.2 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. | ||
|
@@ -754,7 +754,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.3.1-3 app:rake gitlab:backup:restore | ||
sameersbn/gitlab:7.3.2 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. | ||
|
@@ -798,7 +798,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.3.1-3 | ||
docker pull sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
- **Step 2**: Stop and remove the currently running image | ||
|
@@ -812,13 +812,13 @@ docker rm gitlab | |
|
||
```bash | ||
docker run --name=gitlab -it --rm [OPTIONS] \ | ||
sameersbn/gitlab:7.3.1-3 app:rake gitlab:backup:create | ||
sameersbn/gitlab:7.3.2 app:rake gitlab:backup:create | ||
``` | ||
|
||
- **Step 4**: Start the image | ||
|
||
```bash | ||
docker run --name=gitlab -d [OPTIONS] sameersbn/gitlab:7.3.1-3 | ||
docker run --name=gitlab -d [OPTIONS] sameersbn/gitlab:7.3.2 | ||
``` | ||
|
||
## Rake Tasks | ||
|
@@ -827,14 +827,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.3.1-3 app:rake gitlab:env:info | ||
sameersbn/gitlab:7.3.2 app:rake gitlab:env:info | ||
``` | ||
|
||
Similarly, to import bare repositories into GitLab project instance | ||
|
||
```bash | ||
docker run --name=gitlab -d [OPTIONS] \ | ||
sameersbn/gitlab:7.3.1-3 app:rake gitlab:import:repos | ||
sameersbn/gitlab:7.3.2 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. | ||
|