Compare commits

...

1 Commits

Author SHA1 Message Date
coltoneshaw
7c2f073074 updated how files get into the env 2024-10-01 10:22:55 -04:00
2 changed files with 18 additions and 12 deletions

View File

@@ -6,6 +6,12 @@ logs:
@echo "Done" @echo "Done"
setup-mattermost: setup-mattermost:
@cp ./files/mattermost/defaultConfig.json ./volumes/mattermost/config
@cp ./files/mattermost/replicaConfig.json ./volumes/mattermost/config
@cp ./files/mattermost/rtcdConfig.json ./volumes/mattermost/config
@cp ./files/mattermost/samlCert.crt ./volumes/mattermost/config
@cp ./license.mattermost ./volumes/mattermost/config/license.mattermost-enterprise
@./scripts/mattermost.sh setup @./scripts/mattermost.sh setup
check-mattermost: check-mattermost:
@@ -44,6 +50,11 @@ run-mm-replicas:
@echo "Starting Mattermost replicas. Hang in there..." @echo "Starting Mattermost replicas. Hang in there..."
@docker exec -it cs-repro-mattermost mmctl config set ClusterSettings.Enable true --local @docker exec -it cs-repro-mattermost mmctl config set ClusterSettings.Enable true --local
@docker-compose down mattermost @docker-compose down mattermost
@cp ./files/mattermost/defaultConfig.json ./volumes/mattermost_2/config
@cp ./files/mattermost/replicaConfig.json ./volumes/mattermost_2/config
@cp ./files/mattermost/rtcdConfig.json ./volumes/mattermost_2/config
@cp ./files/mattermost/samlCert.crt ./volumes/mattermost_2/config
@cp ./license.mattermost ./volumes/mattermost/mattermost_2/license.mattermost-enterprise
@docker-compose up -d mattermost mattermost-2 @docker-compose up -d mattermost mattermost-2
@docker exec -it -u root cs-repro-mattermost-2 /bin/bash update-ca-certificates @docker exec -it -u root cs-repro-mattermost-2 /bin/bash update-ca-certificates
@echo "Should be up and running. Go crazy." @echo "Should be up and running. Go crazy."

View File

@@ -68,7 +68,7 @@ services:
condition: service_healthy condition: service_healthy
mitmproxy: mitmproxy:
condition: service_started condition: service_started
image: mattermost/mattermost-enterprise-edition:release-9.7 image: mattermost/mattermost-enterprise-edition:release-9.11
restart: unless-stopped restart: unless-stopped
security_opt: security_opt:
- no-new-privileges:true - no-new-privileges:true
@@ -86,18 +86,13 @@ services:
- ./volumes/mattermost/plugins:/mattermost/plugins:rw - ./volumes/mattermost/plugins:/mattermost/plugins:rw
- ./volumes/mattermost/client/plugins:/mattermost/client/plugins:rw - ./volumes/mattermost/client/plugins:/mattermost/client/plugins:rw
- ./volumes/mattermost/bleve-indexes:/mattermost/bleve-indexes:rw - ./volumes/mattermost/bleve-indexes:/mattermost/bleve-indexes:rw
- ./license.mattermost:/mattermost/config/license.mattermost-enterprise:ro
- ./files/mattermost/samlCert.crt:/mattermost/config/saml-cert.crt
- ./files/mattermost/defaultConfig.json:/mattermost/config/defaultConfig.json:ro
- ./files/mattermost/replicaConfig.json:/mattermost/config/replicaConfig.json:ro
- ./files/mattermost/rtcdConfig.json:/mattermost/config/rtcdConfig.json:ro
## Files are required for the mitmproxy on the box ## Files are required for the mitmproxy on the box
- ./files/mitmproxy/mitmproxy-ca.pem:/etc/ssl/certs/mitmproxy-ca.pem - ./files/mitmproxy/mitmproxy-ca.pem:/etc/ssl/certs/mitmproxy-ca.pem
- ./files/mitmproxy/mitmproxy-dhparam.pem:/etc/ssl/certs/mitmproxy-dhparam.pem - ./files/mitmproxy/mitmproxy-dhparam.pem:/etc/ssl/certs/mitmproxy-dhparam.pem
environment: environment:
- HTTP_PROXY=http://cs-repro-mitmproxy:8080 # - HTTP_PROXY=http://cs-repro-mitmproxy:8080
- HTTPS_PROXY=http://cs-repro-mitmproxy:8080 # - HTTPS_PROXY=http://cs-repro-mitmproxy:8080
- MM_SqlSettings_DriverName=postgres - 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_DataSource=postgres://mmuser:mmuser_password@cs-repro-postgres:5432/mattermost?sslmode=disable&connect_timeout=10&binary_parameters=yes
- MM_SAMLSETTINGS_IDPCERTIFICATEFILE=/mattermost/config/saml-cert.crt - MM_SAMLSETTINGS_IDPCERTIFICATEFILE=/mattermost/config/saml-cert.crt
@@ -224,10 +219,10 @@ services:
- ./volumes/mattermost_2/plugins:/mattermost/plugins:rw - ./volumes/mattermost_2/plugins:/mattermost/plugins:rw
- ./volumes/mattermost_2/client/plugins:/mattermost/client/plugins:rw - ./volumes/mattermost_2/client/plugins:/mattermost/client/plugins:rw
- ./volumes/mattermost_2/bleve-indexes:/mattermost/bleve-indexes:rw - ./volumes/mattermost_2/bleve-indexes:/mattermost/bleve-indexes:rw
- ./license.mattermost:/mattermost/config/license.mattermost-enterprise:ro # - ./license.mattermost:/mattermost/config/license.mattermost-enterprise:ro
- ./files/mattermost/samlCert.crt:/mattermost/config/saml-cert.crt # - ./files/mattermost/samlCert.crt:/mattermost/config/saml-cert.crt
- ./files/mattermost/defaultConfig.json:/mattermost/config/defaultConfig.json:ro # - ./files/mattermost/defaultConfig.json:/mattermost/config/defaultConfig.json:ro
- ./files/mattermost/replicaConfig.json:/mattermost/config/replicaConfig.json:ro # - ./files/mattermost/replicaConfig.json:/mattermost/config/replicaConfig.json:ro
## Files are required for the mitmproxy on the box ## Files are required for the mitmproxy on the box
- ./files/mitmproxy/mitmproxy-ca.pem:/etc/ssl/certs/mitmproxy-ca.pem - ./files/mitmproxy/mitmproxy-ca.pem:/etc/ssl/certs/mitmproxy-ca.pem