From 7c2f0730747c72fbcf118237c31d1fcfdfe65921 Mon Sep 17 00:00:00 2001
From: coltoneshaw <colton@theshaw.group>
Date: Tue, 1 Oct 2024 10:22:55 -0400
Subject: [PATCH] updated how files get into the env

---
 Makefile           | 11 +++++++++++
 docker-compose.yml | 19 +++++++------------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 7712f84..55fb381 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,12 @@ logs:
 	@echo "Done"
 
 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
 
 check-mattermost:
@@ -44,6 +50,11 @@ run-mm-replicas:
 	@echo "Starting Mattermost replicas. Hang in there..."
 	@docker exec -it cs-repro-mattermost mmctl config set ClusterSettings.Enable true --local
 	@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 exec -it -u root cs-repro-mattermost-2 /bin/bash update-ca-certificates
 	@echo "Should be up and running. Go crazy."
diff --git a/docker-compose.yml b/docker-compose.yml
index 1d3fb26..b2d6c52 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -68,7 +68,7 @@ services:
         condition: service_healthy
       mitmproxy:
         condition: service_started
-    image: mattermost/mattermost-enterprise-edition:release-9.7
+    image: mattermost/mattermost-enterprise-edition:release-9.11
     restart: unless-stopped
     security_opt:
       - no-new-privileges:true
@@ -86,18 +86,13 @@ services:
       - ./volumes/mattermost/plugins:/mattermost/plugins:rw
       - ./volumes/mattermost/client/plugins:/mattermost/client/plugins: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/mitmproxy/mitmproxy-ca.pem:/etc/ssl/certs/mitmproxy-ca.pem
       - ./files/mitmproxy/mitmproxy-dhparam.pem:/etc/ssl/certs/mitmproxy-dhparam.pem
     environment:
-      - HTTP_PROXY=http://cs-repro-mitmproxy:8080
-      - HTTPS_PROXY=http://cs-repro-mitmproxy:8080
+      # - HTTP_PROXY=http://cs-repro-mitmproxy:8080
+      # - HTTPS_PROXY=http://cs-repro-mitmproxy:8080
       - 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_SAMLSETTINGS_IDPCERTIFICATEFILE=/mattermost/config/saml-cert.crt
@@ -224,10 +219,10 @@ services:
         - ./volumes/mattermost_2/plugins:/mattermost/plugins:rw
         - ./volumes/mattermost_2/client/plugins:/mattermost/client/plugins:rw
         - ./volumes/mattermost_2/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
+        # - ./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 are required for the mitmproxy on the box
         - ./files/mitmproxy/mitmproxy-ca.pem:/etc/ssl/certs/mitmproxy-ca.pem