Skip to content
Snippets Groups Projects
Verified Commit 5b5da0c5 authored by Olivier Benz's avatar Olivier Benz
Browse files

Merge branch 'develop'

parents 341b2cd2 ef6b11ab
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
[This project](https://gitlab.com/b-data/docker/deployments/gitlab-ce) serves as [This project](https://gitlab.com/b-data/docker/deployments/gitlab-ce) serves as
a template to run [gitlab-ce](https://hub.docker.com/r/gitlab/gitlab-ce) in a a template to run [gitlab-ce](https://hub.docker.com/r/gitlab/gitlab-ce) in a
docker container using docker-compose. docker container using docker compose.
The docker image is a monolithic image of GitLab running all the necessary The docker image is a monolithic image of GitLab running all the necessary
services in a single container. services in a single container.
...@@ -90,7 +90,7 @@ The following is required: ...@@ -90,7 +90,7 @@ The following is required:
step 4. step 4.
1. Start the container in detached mode: 1. Start the container in detached mode:
```bash ```bash
docker-compose up -d docker compose up -d
``` ```
### GitLab ### GitLab
...@@ -145,7 +145,7 @@ Add Mattermost to Applications: ...@@ -145,7 +145,7 @@ Add Mattermost to Applications:
* `MM_GITLAB_SECRET`: "Secret" from GitLab * `MM_GITLAB_SECRET`: "Secret" from GitLab
1. Reconfigure GitLab: 1. Reconfigure GitLab:
```shell ```shell
docker-compose up -d docker compose up -d
``` ```
1. Wait until GitLab container is ready again. 1. Wait until GitLab container is ready again.
1. Log into https://mattermost.mydomain.com using "GitLab Single Sign-On". 1. Log into https://mattermost.mydomain.com using "GitLab Single Sign-On".
......
This diff is collapsed.
sources: sources:
- file_name: gitlab.rb.template - file_name: gitlab.rb.template
url: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template url: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template
date: 2021-10-07 date: 2022-09-08
version: '3.8' version: '3.9'
services: services:
gitlab: gitlab:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment