From d0a1dce9a6c8e47c80bf5dbae3791caeaef2cb55 Mon Sep 17 00:00:00 2001 From: mk Date: Thu, 19 Dec 2024 12:17:54 +0100 Subject: [PATCH] test --- Makefile | 16 +++++++------- docker-compose.yml | 54 +++++++++++++++++++++++----------------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 7712f84..862dc59 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ .PHONY: stop start check_mattermost - + logs: @echo "Following logs..." @docker-compose logs --follow @@ -20,9 +20,9 @@ restore-keycloak: echo-logins: @./scripts/general.sh logins -run: +run: @echo "Starting..." - @make restore-keycloak + #@make restore-keycloak @make run-core @make setup-mattermost @make echo-logins @@ -30,7 +30,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..." @@ -39,7 +39,7 @@ run-db-replicas: @echo "Should be up and running. Go crazy." -## Need a way to modify the +## Need a way to modify the run-mm-replicas: @echo "Starting Mattermost replicas. Hang in there..." @docker exec -it cs-repro-mattermost mmctl config set ClusterSettings.Enable true --local @@ -60,7 +60,7 @@ run-all: run run-db-replicas run-mm-replicas start: @echo "Starting the existing deployment..." @docker-compose start - + stop: @echo "Stopping..." @docker-compose stop @@ -105,12 +105,12 @@ delete-dockerfiles: delete-data: stop delete-dockerfiles -nuke: +nuke: @echo "Nuking Docker..." @docker-compose down --volumes --remove-orphans @make delete-data -nuke-rmi: +nuke-rmi: @echo "Nuking Docker with images..." @docker-compose down --rmi all --volumes --remove-orphans @make delete-data diff --git a/docker-compose.yml b/docker-compose.yml index 1d3fb26..bad228a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -66,9 +66,9 @@ services: depends_on: postgres: condition: service_healthy - mitmproxy: - condition: service_started - image: mattermost/mattermost-enterprise-edition:release-9.7 + #mitmproxy: + # condition: service_started + image: mattermost/mattermost-enterprise-edition:release-9.11 restart: unless-stopped security_opt: - no-new-privileges:true @@ -86,18 +86,18 @@ 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 + #- ./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 +115,7 @@ services: container_name: cs-repro-keycloak restart: unless-stopped platform: linux/amd64 - image: quay.io/keycloak/keycloak:18.0.0 + image: quay.io/keycloak/keycloak:latest volumes: - ./volumes/keycloak:/opt/keycloak/data:rw environment: @@ -144,8 +144,8 @@ services: - ./volumes/elastic/data:/usr/share/elasticsearch/data - ./volumes/elastic/plugins:/usr/share/elasticsearch/plugins command: > - /bin/sh -c "./bin/elasticsearch-plugin list | grep -q analysis-icu - || yes | ./bin/elasticsearch-plugin install --silent analysis-icu; + /bin/sh -c "./bin/elasticsearch-plugin list | grep -q analysis-icu + || yes | ./bin/elasticsearch-plugin install --silent analysis-icu; /usr/local/bin/docker-entrypoint.sh eswrapper" ports: - 9200:9200 @@ -204,9 +204,9 @@ services: depends_on: postgres: condition: service_healthy - mitmproxy: - condition: service_started - image: mattermost/mattermost-enterprise-edition:release-9.7 + #mitmproxy: + # condition: service_started + image: mattermost/mattermost-enterprise-edition:release-9.11 restart: unless-stopped security_opt: - no-new-privileges:true @@ -258,16 +258,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 @@ -293,4 +293,4 @@ services: # # Where our data will be persisted # volumes: # - ./volumes/db/mysql:/var/lib/mysql - \ No newline at end of file +