diff --git a/docker-compose.yml b/docker-compose.yml index 52c2529..c01a480 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,31 @@ version: "3.9" services: + # mysql: + # container_name: cs-repro-mysql + # image: mysql:8 + # restart: always + # environment: + # MYSQL_DATABASE: "mattermost" + # # So you don't have to use root, but you can if you like + # MYSQL_USER: "mmuser" + # # You can use whatever password you like + # MYSQL_PASSWORD: "mmuser_password" + # # Password for root access + # MYSQL_ROOT_PASSWORD: "mmuser_password" + # healthcheck: + # test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] + # timeout: 20s + # retries: 10 + # ports: + # # : + # - "3306:3306" + # expose: + # # Opens port 3306 on the container + # - "3306" + # # Where our data will be persisted + # volumes: + # - ./volumes/db/mysql:/var/lib/mysql postgres: container_name: cs-repro-postgres environment: @@ -27,6 +52,7 @@ services: timeout: 3s retries: 3 openldap: + platform: linux/amd64 container_name: cs-repro-openldap hostname: openldap restart: unless-stopped @@ -63,7 +89,7 @@ services: depends_on: postgres: condition: service_healthy - image: mattermost/mattermost-enterprise-edition:release-7.8 + image: mattermost/mattermost-enterprise-edition:release-7.9 restart: unless-stopped security_opt: - no-new-privileges:true @@ -83,10 +109,13 @@ services: - ./volumes/mattermost/bleve-indexes:/mattermost/bleve-indexes:rw - ./license.mattermost:/mattermost/config/license.mattermost-enterprise:ro - ./files/mattermost/samlCert.crt:/mattermost/config/samlCert.crt - - ./files/mattermost/defaultConfig.json:/mattermost/config/defaultConfig.json + - ./files/mattermost/advancedLogging.json:/mattermost/config/advancedLogging.json:ro + - ./files/mattermost/defaultConfig.json:/mattermost/config/defaultConfig.json:ro environment: - MM_SqlSettings_DriverName=postgres - MM_SqlSettings_DataSource=postgres://mmuser:mmuser_password@cs-repro-postgres:5432/mattermost?sslmode=disable&connect_timeout=10&binary_parameters=yes + # - MM_SqlSettings_DriverName=mysql + # - MM_SqlSettings_DataSource=mmuser:mmuser_password@tcp(mysql:3306)/mattermost?charset=utf8mb4,utf8&writeTimeout=30s - MM_ServiceSettings_EnableLocalMode=true - MM_ServiceSettings_LocalModeSocketLocation=/var/tmp/mattermost_local.socket - MM_ServiceSettings_LicenseFileLocation=/mattermost/config/license.mattermost-enterprise diff --git a/files/mattermost/advancedLogging.json b/files/mattermost/advancedLogging.json index 8a15dc7..1665d14 100644 --- a/files/mattermost/advancedLogging.json +++ b/files/mattermost/advancedLogging.json @@ -30,7 +30,7 @@ ], "Options": { "Compress": true, - "Filename": "traceLogs.json", + "Filename": "./logs/traceLogs.json", "MaxAgeDays": 15, "MaxBackups": 3, "MaxSizeMB": 100 diff --git a/files/mattermost/defaultConfig.json b/files/mattermost/defaultConfig.json index 290c590..e057114 100644 --- a/files/mattermost/defaultConfig.json +++ b/files/mattermost/defaultConfig.json @@ -15,7 +15,7 @@ "EnableWebhookDebugging": true, "EnableDiagnostics": true, "EnableSentry": true, - "AdvancedLoggingConfig": "" + "AdvancedLoggingConfig": "./advancedLogging.json" }, "ExperimentalAuditSettings": { "FileEnabled": false, @@ -25,7 +25,7 @@ "FileMaxBackups": 0, "FileCompress": false, "FileMaxQueueSize": 1000, - "AdvancedLoggingConfig": "" + "AdvancedLoggingConfig": "./advancedLogging.json" }, "NotificationLogSettings": { "EnableConsole": true, @@ -36,7 +36,7 @@ "FileLevel": "INFO", "FileJson": true, "FileLocation": "", - "AdvancedLoggingConfig": "" + "AdvancedLoggingConfig": "./advancedLogging.json" }, "LdapSettings": { "Enable": true,