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 44 additions and 38 deletions

View File

@@ -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:
@@ -22,7 +28,7 @@ echo-logins:
run:
@echo "Starting..."
#@make restore-keycloak
@make restore-keycloak
@make run-core
@make setup-mattermost
@make echo-logins
@@ -30,7 +36,7 @@ run:
run-core:
@echo "Starting the core services... hang in there."
@docker-compose up -d postgres openldap prometheus grafana elasticsearch mattermost keycloak #mitmproxy
@docker-compose up -d postgres openldap prometheus grafana elasticsearch mattermost keycloak mitmproxy
run-db-replicas:
@echo "Starting with replicas. Hang in there..."
@@ -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."

View File

@@ -66,8 +66,8 @@ services:
depends_on:
postgres:
condition: service_healthy
#mitmproxy:
# condition: service_started
mitmproxy:
condition: service_started
image: mattermost/mattermost-enterprise-edition:release-9.11
restart: unless-stopped
security_opt:
@@ -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
@@ -115,7 +110,7 @@ services:
container_name: cs-repro-keycloak
restart: unless-stopped
platform: linux/amd64
image: quay.io/keycloak/keycloak:latest
image: quay.io/keycloak/keycloak:18.0.0
volumes:
- ./volumes/keycloak:/opt/keycloak/data:rw
environment:
@@ -204,9 +199,9 @@ services:
depends_on:
postgres:
condition: service_healthy
#mitmproxy:
# condition: service_started
image: mattermost/mattermost-enterprise-edition:release-9.11
mitmproxy:
condition: service_started
image: mattermost/mattermost-enterprise-edition:release-9.7
restart: unless-stopped
security_opt:
- no-new-privileges:true
@@ -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
@@ -258,16 +253,16 @@ services:
- "8443:8443/udp"
- "8443:8443/tcp"
- "8045:8045"
#mitmproxy:
# container_name: cs-repro-mitmproxy
# image: mitmproxy/mitmproxy
# command: mitmweb --web-host 0.0.0.0 --set confdir=/certs --mode transparent
# volumes:
# - ./files/mitmproxy:/certs
# ports:
# - "8180:8080"
# - "8181:8081"
# restart: unless-stopped
mitmproxy:
container_name: cs-repro-mitmproxy
image: mitmproxy/mitmproxy
command: mitmweb --web-host 0.0.0.0 --set confdir=/certs --mode transparent
volumes:
- ./files/mitmproxy:/certs
ports:
- "8180:8080"
- "8181:8081"
restart: unless-stopped
# mysql:
# container_name: cs-repro-mysql
# image: mysql:8