mirror of
https://github.com/sameersbn/docker-gitlab.git
synced 2026-01-18 13:58:25 +00:00
release 7.13.0
This commit is contained in:
parent
49d5e6ca4a
commit
92fd0b5a72
@ -2,7 +2,7 @@
|
||||
|
||||
This file only reflects the changes that are made in the the docker image. Please refer to the upstream GitLab [CHANGELOG](https://github.com/gitlabhq/gitlabhq/blob/master/CHANGELOG) for the list of changes in GitLab.
|
||||
|
||||
**latest**
|
||||
**7.13.0**
|
||||
- expose SAML OAuth provider configuration
|
||||
- expose `OAUTH_AUTO_SIGN_IN_WITH_PROVIDER` configuration
|
||||
- gitlab: upgrade to CE v.7.13.0
|
||||
|
||||
50
README.md
50
README.md
@ -61,7 +61,7 @@ Dockerfile to build a [GitLab](https://about.gitlab.com/) container image.
|
||||
|
||||
## Version
|
||||
|
||||
Current Version: `7.12.2-2`
|
||||
Current Version: `7.13.0`
|
||||
|
||||
# Contributing
|
||||
|
||||
@ -110,7 +110,7 @@ Your docker host needs to have 1GB or more of available RAM to run GitLab. Pleas
|
||||
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.12.2-2
|
||||
docker pull sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
You can also pull the `latest` tag which is built from the repository *HEAD*
|
||||
@ -164,7 +164,7 @@ docker run --name gitlab -d \
|
||||
--publish 10022:22 --publish 10080:80 \
|
||||
--env 'GITLAB_PORT=10080' --env 'GITLAB_SSH_PORT=10022' \
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:7.12.2-2
|
||||
sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
*Please refer to [Available Configuration Parameters](#available-configuration-parameters) to understand `GITLAB_PORT` and other configuration options*
|
||||
@ -200,7 +200,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:7.12.2-2
|
||||
sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
## Database
|
||||
@ -231,7 +231,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:7.12.2-2
|
||||
sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
#### Linking to PostgreSQL Container
|
||||
@ -274,7 +274,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:7.12.2-2
|
||||
sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
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:
|
||||
@ -327,7 +327,7 @@ docker run --name gitlab -d \
|
||||
--env 'DB_HOST=192.168.1.100' --env 'DB_NAME=gitlabhq_production' \
|
||||
--env 'DB_USER=gitlab' --env 'DB_PASS=password' \
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:7.12.2-2
|
||||
sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
#### Linking to MySQL Container
|
||||
@ -370,7 +370,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:7.12.2-2
|
||||
sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
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:
|
||||
@ -397,7 +397,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:7.12.2-2
|
||||
sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
### Linking to Redis Container
|
||||
@ -424,7 +424,7 @@ We are now ready to start the GitLab application.
|
||||
|
||||
```bash
|
||||
docker run --name gitlab -d --link gitlab-redis:redisio \
|
||||
sameersbn/gitlab:7.12.2-2
|
||||
sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
### Mail
|
||||
@ -437,7 +437,7 @@ Please refer the [Available Configuration Parameters](#available-configuration-p
|
||||
docker run --name gitlab -d \
|
||||
--env 'SMTP_USER=USER@gmail.com' --env 'SMTP_PASS=PASSWORD' \
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:7.12.2-2
|
||||
sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
### SSL
|
||||
@ -510,7 +510,7 @@ HTTPS support can be enabled by setting the `GITLAB_HTTPS` option to `true`. Add
|
||||
docker run --name gitlab -d \
|
||||
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:7.12.2-2
|
||||
sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
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.
|
||||
@ -526,7 +526,7 @@ docker run --name gitlab -d \
|
||||
--env 'GITLAB_HTTPS=true' --env 'SSL_SELF_SIGNED=true' \
|
||||
--env 'GITLAB_HTTPS_HSTS_MAXAGE=2592000'
|
||||
--volume /srv/docker/gitlab/gitlab:/home/git/data \
|
||||
sameersbn/gitlab:7.12.2-2
|
||||
sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
If you want to completely disable HSTS set `GITLAB_HTTPS_HSTS_ENABLED` to `false`.
|
||||
@ -549,7 +549,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:7.12.2-2
|
||||
sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
Again, drop the `--env 'SSL_SELF_SIGNED=true'` option if you are using CA certified SSL certificates.
|
||||
@ -597,7 +597,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:7.12.2-2
|
||||
sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
GitLab will now be accessible at the `/git` path, e.g. `http://www.example.com/git`.
|
||||
@ -662,7 +662,7 @@ Please refer to [Available Configuration Parameters](#available-configuration-pa
|
||||
|
||||
### External Issue Trackers
|
||||
|
||||
Since version `7.12.2-2` support for external issue trackers can be enabled in the "Service Templates" section of the settings panel.
|
||||
Since version `7.13.0` support for external issue trackers can be enabled in the "Service Templates" section of the settings panel.
|
||||
|
||||
If you are using the [docker-redmine](https://github.com/sameersbn/docker-redmine) image, you can *one up* the gitlab integration with redmine by adding `--volumes-from=gitlab` flag to the docker run command while starting the redmine container.
|
||||
|
||||
@ -677,14 +677,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:7.12.2-2
|
||||
sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
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.12.2-2 app:sanitize
|
||||
sameersbn/gitlab:7.13.0 app:sanitize
|
||||
```
|
||||
|
||||
### Piwik
|
||||
@ -829,7 +829,7 @@ Execute the rake task to create a backup.
|
||||
|
||||
```bash
|
||||
docker run --name gitlab -it --rm [OPTIONS] \
|
||||
sameersbn/gitlab:7.12.2-2 app:rake gitlab:backup:create
|
||||
sameersbn/gitlab:7.13.0 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_CI_BACKUP_DIR` configuration parameter.
|
||||
@ -850,7 +850,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:7.12.2-2 app:rake gitlab:backup:restore
|
||||
sameersbn/gitlab:7.13.0 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.
|
||||
@ -859,7 +859,7 @@ To avoid user interaction in the restore operation, specify the timestamp of the
|
||||
|
||||
```bash
|
||||
docker run --name gitlab -it --rm [OPTIONS] \
|
||||
sameersbn/gitlab:7.12.2-2 app:rake gitlab:backup:restore BACKUP=1417624827
|
||||
sameersbn/gitlab:7.13.0 app:rake gitlab:backup:restore BACKUP=1417624827
|
||||
```
|
||||
|
||||
## Automated Backups
|
||||
@ -884,7 +884,7 @@ 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.12.2-2 app:rake gitlab:env:info
|
||||
sameersbn/gitlab:7.13.0 app:rake gitlab:env:info
|
||||
```
|
||||
|
||||
You can also use `docker exec` to run raketasks on running gitlab instance. For example,
|
||||
@ -897,7 +897,7 @@ Similarly, to import bare repositories into GitLab project instance
|
||||
|
||||
```bash
|
||||
docker run --name gitlab -d [OPTIONS] \
|
||||
sameersbn/gitlab:7.12.2-2 app:rake gitlab:import:repos
|
||||
sameersbn/gitlab:7.13.0 app:rake gitlab:import:repos
|
||||
```
|
||||
|
||||
Or
|
||||
@ -919,7 +919,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.12.2-2
|
||||
docker pull sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
- **Step 2**: Stop and remove the currently running image
|
||||
@ -941,7 +941,7 @@ Replace `x.x.x` with the version you are upgrading from. For example, if you are
|
||||
- **Step 4**: Start the image
|
||||
|
||||
```bash
|
||||
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:7.12.2-2
|
||||
docker run --name gitlab -d [OPTIONS] sameersbn/gitlab:7.13.0
|
||||
```
|
||||
|
||||
## Shell Access
|
||||
|
||||
@ -7,7 +7,7 @@ postgresql:
|
||||
volumes:
|
||||
- /srv/docker/gitlab/postgresql:/var/lib/postgresql
|
||||
gitlab:
|
||||
image: sameersbn/gitlab:7.12.2-2
|
||||
image: sameersbn/gitlab:7.13.0
|
||||
links:
|
||||
- redis:redisio
|
||||
- postgresql:postgresql
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user