From 926a01640b2ebd8d15fca182fad5e0a3510142c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=BE=D0=B2=20=D0=90=D1=80=D1=82?= =?UTF-8?q?=D0=B5=D0=BC?= Date: Mon, 8 Jun 2026 21:37:51 +0300 Subject: [PATCH] remove bash code from docker-compose. Add Dockerfile. Remove comments. --- app/src/handlers/edge5-modbus.ts | 5 ----- docker-compose.yml | 16 ++-------------- mosquitto/Dockerfile | 3 +++ 3 files changed, 5 insertions(+), 19 deletions(-) create mode 100644 mosquitto/Dockerfile diff --git a/app/src/handlers/edge5-modbus.ts b/app/src/handlers/edge5-modbus.ts index 1997fdc..712a52e 100644 --- a/app/src/handlers/edge5-modbus.ts +++ b/app/src/handlers/edge5-modbus.ts @@ -44,11 +44,6 @@ function toMetrics(values: number[], timestamp: number): Edge5ModbusMetric[] { } async function postMetrics(metrics: Edge5ModbusMetric[]): Promise { - // console.log('edge5.modbus.post_payload', JSON.stringify(metrics)) - // console.log('edge5.modbus.post_skipped', { - // url: postUrl, - // count: metrics.length, - // }) const response = await fetch(postUrl, { method: 'POST', diff --git a/docker-compose.yml b/docker-compose.yml index 988f0b7..7c436be 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,21 +1,9 @@ services: mosquitto: - image: eclipse-mosquitto:2 + build: ./mosquitto container_name: mosquitto ports: - "1883:1883" - command: - - /bin/sh - - -c - - | - cat > /tmp/mosquitto.conf <<'EOF' - listener 1883 - allow_anonymous true - persistence true - persistence_location /mosquitto/data/ - log_dest stdout - EOF - exec mosquitto -c /tmp/mosquitto.conf volumes: - mosquitto_data:/mosquitto/data @@ -31,7 +19,7 @@ services: MQTT_URL: mqtt://mosquitto:1883 HTTP_PORT: "80" WS_PORT: "9090" - CLOUD_INGEST_URL: ${CLOUD_INGEST_URL:-https://demo.backend.drill.greact.ru/api/ingest} + CLOUD_INGEST_URL: ${CLOUD_INGEST_URL:-https://demo.backend.drill.greact.ru/ingest} volumes: mosquitto_data: diff --git a/mosquitto/Dockerfile b/mosquitto/Dockerfile new file mode 100644 index 0000000..60d454b --- /dev/null +++ b/mosquitto/Dockerfile @@ -0,0 +1,3 @@ +FROM eclipse-mosquitto:2 + +COPY config/mosquitto.conf /mosquitto/config/mosquitto.conf -- 2.49.1