From 4aa164d14811c1898fa715739c3f878c8f9a2875 Mon Sep 17 00:00:00 2001 From: Mirko Milovanovic Date: Wed, 5 Feb 2025 23:37:49 +0100 Subject: [PATCH] feat: update docker-compose and service configurations for improved connectivity --- docker-compose.yml | 11 ++++++----- main.py | 2 +- webrtc-internals-exporter/background.js | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 491a2fe..a779af8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,8 +2,6 @@ services: selenium: container_name: selenium-standalone-chromium image: selenium/standalone-chromium:129.0 - ports: - - "7900:7900" volumes: - ./webrtc-internals-exporter:/tmp/webrtc-internals-exporter:ro shm_size: "2g" @@ -13,8 +11,7 @@ services: interval: 5s timeout: 10s retries: 5 - networks: - - backend + network_mode: host telegraf: container_name: telegraf @@ -30,7 +27,7 @@ services: collector: container_name: collector - image: gitea.kobim.cloud/kobim/peertube-collector + #image: gitea.kobim.cloud/kobim/peertube-collector build: context: . dockerfile: Dockerfile @@ -41,6 +38,10 @@ services: condition: service_started environment: - VIDEO_URL=${VIDEO_URL:?"Video URL is required"} + ports: + - "9092:9092" + extra_hosts: + - "host.docker.internal:host-gateway" networks: - backend diff --git a/main.py b/main.py index d3e3b19..fed233d 100644 --- a/main.py +++ b/main.py @@ -49,7 +49,7 @@ def setupChromeDriver(): chrome_options.add_experimental_option('prefs', {'intl.accept_languages': 'en,en_US'}) #driver = webdriver.Chrome(options=chrome_options) - driver = webdriver.Remote(command_executor='http://selenium-standalone-chromium:4444', options=chrome_options) + driver = webdriver.Remote(command_executor='http://host.docker.internal:4444', options=chrome_options) logger.log(logging.INFO, 'Chrome driver setup complete.') return driver diff --git a/webrtc-internals-exporter/background.js b/webrtc-internals-exporter/background.js index 71ccc94..ec5c949 100644 --- a/webrtc-internals-exporter/background.js +++ b/webrtc-internals-exporter/background.js @@ -9,7 +9,7 @@ log("loaded"); import "/assets/pako.min.js"; const DEFAULT_OPTIONS = { - url: "http://collector:9092", + url: "http://localhost:9092", username: "", password: "", updateInterval: 2, @@ -18,6 +18,7 @@ const DEFAULT_OPTIONS = { enabledOrigins: { "http://*/*": true, "https://*/*": true, + "https://tube.kobim.cloud" }, enabledStats: ["data-channel", "local-candidate", "remote-candidate"] };