mirror of
https://github.com/sameersbn/docker-gitlab.git
synced 2026-01-25 14:08:09 +00:00
release 7.3.1-2
This commit is contained in:
parent
643fb3a9fd
commit
e2bb93498e
@ -1,5 +1,8 @@
|
||||
# Changelog
|
||||
|
||||
**7.3.1-2**
|
||||
- fix mysql server status check
|
||||
|
||||
**7.3.1-1**
|
||||
- plug bash vulnerability by switching to dash shell
|
||||
- automatically run the `gitlab:setup` rake task for new installs
|
||||
|
||||
50
README.md
50
README.md
@ -60,7 +60,7 @@ Dockerfile to build a GitLab container image.
|
||||
|
||||
## Version
|
||||
|
||||
Current Version: **7.3.1-1**
|
||||
Current Version: **7.3.1-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-1
|
||||
docker pull sameersbn/gitlab:7.3.1-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-1
|
||||
sameersbn/gitlab:7.3.1-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-1
|
||||
sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
## Database
|
||||
@ -239,7 +239,7 @@ The updated run command looks like this.
|
||||
```bash
|
||||
docker run --name=gitlab -d \
|
||||
-v /opt/gitlab/data:/home/git/data \
|
||||
-v /opt/gitlab/mysql:/var/lib/mysql sameersbn/gitlab:7.3.1-1
|
||||
-v /opt/gitlab/mysql:/var/lib/mysql sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
This will make sure that the data stored in the database is not lost when the image is stopped and started again.
|
||||
@ -264,7 +264,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-1
|
||||
sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
#### Linking to MySQL Container
|
||||
@ -320,7 +320,7 @@ docker run --name=gitlab -d --link mysql:mysql \
|
||||
-e 'DB_USER=gitlab' -e 'DB_PASS=password' \
|
||||
-e 'DB_NAME=gitlabhq_production' \
|
||||
-v /opt/gitlab/data:/home/git/data \
|
||||
sameersbn/gitlab:7.3.1-1
|
||||
sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
### PostgreSQL
|
||||
@ -343,7 +343,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-1
|
||||
sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
#### Linking to PostgreSQL Container
|
||||
@ -402,7 +402,7 @@ docker run --name=gitlab -d --link postgresql:postgresql \
|
||||
-e 'DB_USER=gitlab' -e 'DB_PASS=password' \
|
||||
-e 'DB_NAME=gitlabhq_production' \
|
||||
-v /opt/gitlab/data:/home/git/data \
|
||||
sameersbn/gitlab:7.3.1-1
|
||||
sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
## Redis
|
||||
@ -431,7 +431,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-1
|
||||
sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
### Linking to Redis Container
|
||||
@ -456,7 +456,7 @@ We are now ready to start the GitLab application.
|
||||
|
||||
```bash
|
||||
docker run --name=gitlab -d --link redis:redisio \
|
||||
sameersbn/gitlab:7.3.1-1
|
||||
sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
### Mail
|
||||
@ -478,7 +478,7 @@ The following environment variables need to be specified to get mail support to
|
||||
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.3.1-1
|
||||
sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
### SSL
|
||||
@ -551,7 +551,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-1
|
||||
sameersbn/gitlab:7.3.1-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.
|
||||
@ -567,7 +567,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-1
|
||||
sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
If you want to completely disable HSTS set `GITLAB_HTTPS_HSTS_ENABLED` to `false`.
|
||||
@ -589,7 +589,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-1
|
||||
sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
Again, drop the `-e 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
|
||||
@ -633,7 +633,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-1
|
||||
sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
|
||||
@ -648,7 +648,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.3.1-1
|
||||
sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
If you are using an external mysql database
|
||||
@ -659,7 +659,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.3.1-1
|
||||
sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
### OmniAuth Integration
|
||||
@ -804,7 +804,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-1 app:rake gitlab:backup:create
|
||||
sameersbn/gitlab:7.3.1-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.
|
||||
@ -821,7 +821,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-1 app:rake gitlab:backup:restore
|
||||
sameersbn/gitlab:7.3.1-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.
|
||||
@ -865,7 +865,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-1
|
||||
docker pull sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
- **Step 2**: Stop and remove the currently running image
|
||||
@ -879,13 +879,13 @@ docker rm gitlab
|
||||
|
||||
```bash
|
||||
docker run --name=gitlab -it --rm [OPTIONS] \
|
||||
sameersbn/gitlab:7.3.1-1 app:rake gitlab:backup:create
|
||||
sameersbn/gitlab:7.3.1-2 app:rake gitlab:backup:create
|
||||
```
|
||||
|
||||
- **Step 4**: Start the image
|
||||
|
||||
```bash
|
||||
docker run --name=gitlab -d [OPTIONS] sameersbn/gitlab:7.3.1-1
|
||||
docker run --name=gitlab -d [OPTIONS] sameersbn/gitlab:7.3.1-2
|
||||
```
|
||||
|
||||
## Rake Tasks
|
||||
@ -894,14 +894,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-1 app:rake gitlab:env:info
|
||||
sameersbn/gitlab:7.3.1-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-1 app:rake gitlab:import:repos
|
||||
sameersbn/gitlab:7.3.1-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.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user