From 732896c1855bf43ed355b85e99d01d8d86a27f5f Mon Sep 17 00:00:00 2001 From: craph Date: Fri, 17 Dec 2021 12:50:17 +0100 Subject: [PATCH] Fix bad location for GITLAB_PKI_CHAIN_PATH option (#68) --- docker-compose.nginx.yml | 4 ---- docker-compose.yml | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.nginx.yml b/docker-compose.nginx.yml index 7994d8a..a709d55 100644 --- a/docker-compose.nginx.yml +++ b/docker-compose.nginx.yml @@ -21,10 +21,6 @@ services: - ${CERT_PATH}:/cert.pem:ro - ${KEY_PATH}:/key.pem:ro - shared-webroot:/usr/share/nginx/html - # When you want to use SSO with GitLab, you have to add the cert pki chain of GitLab inside Alpine - # to avoid Token request failed: certificate signed by unknown authority - # (link: https://github.com/mattermost/mattermost-server/issues/13059 and https://github.com/mattermost/docker/issues/34) - # - ${GITLAB_PKI_CHAIN_PATH}:/etc/ssl/certs/pki_chain.pem:ro environment: # timezone inside container - TZ diff --git a/docker-compose.yml b/docker-compose.yml index 2721f5e..35501c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -43,6 +43,10 @@ services: - ${MATTERMOST_LOGS_PATH}:/mattermost/logs:rw - ${MATTERMOST_PLUGINS_PATH}:/mattermost/plugins:rw - ${MATTERMOST_CLIENT_PLUGINS_PATH}:/mattermost/client/plugins:rw + # When you want to use SSO with GitLab, you have to add the cert pki chain of GitLab inside Alpine + # to avoid Token request failed: certificate signed by unknown authority + # (link: https://github.com/mattermost/mattermost-server/issues/13059 and https://github.com/mattermost/docker/issues/34) + # - ${GITLAB_PKI_CHAIN_PATH}:/etc/ssl/certs/pki_chain.pem:ro environment: # timezone inside container - TZ