From 194191d22d5e2ff896fda0c90b037d898e1bffa7 Mon Sep 17 00:00:00 2001 From: lablans Date: Mon, 24 Apr 2023 07:43:52 +0000 Subject: [PATCH 1/4] SNAP: HTTP debug via mitmproxy --- snap/docker-compose.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/snap/docker-compose.yml b/snap/docker-compose.yml index b79505f..012c465 100644 --- a/snap/docker-compose.yml +++ b/snap/docker-compose.yml @@ -1,6 +1,13 @@ version: "3.7" services: + mitmproxy: + image: mitmproxy/mitmproxy + stop_signal: SIGKILL + command: mitmweb --web-host 0.0.0.0 --web-port 9090 + ports: + - 9090:9090 + traefik: container_name: bridgehead-traefik image: docker.verbis.dkfz.de/cache/traefik:latest @@ -51,6 +58,7 @@ services: AUTH_USER: ${AUTH_USER} AUTH_PW: ${AUTH_PW} BEAM_PROXY: http://beam-proxy:8081 + ALL_PROXY: http://mitmproxy:8080 depends_on: - "beam-proxy" From d5d4419374b43865cebeb253a6072d4b31f902d3 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Mon, 24 Apr 2023 11:43:30 +0200 Subject: [PATCH 2/4] Comment out mitmproxy --- snap/docker-compose.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/snap/docker-compose.yml b/snap/docker-compose.yml index 012c465..ef2c41e 100644 --- a/snap/docker-compose.yml +++ b/snap/docker-compose.yml @@ -1,12 +1,12 @@ version: "3.7" services: - mitmproxy: - image: mitmproxy/mitmproxy - stop_signal: SIGKILL - command: mitmweb --web-host 0.0.0.0 --web-port 9090 - ports: - - 9090:9090 +# mitmproxy: +# image: mitmproxy/mitmproxy +# stop_signal: SIGKILL +# command: mitmweb --web-host 0.0.0.0 --web-port 9090 +# ports: +# - 9090:9090 traefik: container_name: bridgehead-traefik @@ -58,7 +58,7 @@ services: AUTH_USER: ${AUTH_USER} AUTH_PW: ${AUTH_PW} BEAM_PROXY: http://beam-proxy:8081 - ALL_PROXY: http://mitmproxy:8080 +# MITM_PROXY: http://mitmproxy:8080 --> set like this in override if needed depends_on: - "beam-proxy" From 4df6abc50dfb4f403b5e6b69673cb3157b536c24 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Mon, 24 Apr 2023 11:43:46 +0200 Subject: [PATCH 3/4] Make forward_proxy and spot close faster --- snap/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/snap/docker-compose.yml b/snap/docker-compose.yml index ef2c41e..e41a7dd 100644 --- a/snap/docker-compose.yml +++ b/snap/docker-compose.yml @@ -39,6 +39,7 @@ services: forward_proxy: container_name: bridgehead-forward-proxy + stop_signal: SIGKILL image: docker.verbis.dkfz.de/cache/samply/bridgehead-forward-proxy:latest environment: HTTPS_PROXY: ${HTTPS_PROXY_URL} @@ -49,6 +50,7 @@ services: spot: image: docker.verbis.dkfz.de/cache/samply/spot:feature-loadcerts + stop_signal: SIGKILL container_name: bridgehead-spot environment: SECRET: ${SPOT_BEAM_SECRET_LONG} From 8aa9e9a10dea242464904e661913cbcdb6744681 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Mon, 24 Apr 2023 11:43:53 +0200 Subject: [PATCH 4/4] Remove blaze-data volume --- snap/docker-compose.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/snap/docker-compose.yml b/snap/docker-compose.yml index e41a7dd..f0529c9 100644 --- a/snap/docker-compose.yml +++ b/snap/docker-compose.yml @@ -85,10 +85,6 @@ services: - /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro - ./root.crt.pem:/conf/root.crt.pem:ro - -volumes: - blaze-data: - secrets: proxy.pem: file: /etc/bridgehead/pki/${SITE_ID}.priv.pem