From a2f7dfef080e97ee1e5b490e5f9cf1fb0079e31e Mon Sep 17 00:00:00 2001 From: BlazSmehov Date: Wed, 14 Jan 2026 09:50:02 +0100 Subject: [PATCH] chore: update docker compose, dockerfile of decoder to copy the decoding config, add open api schema for beacon parser --- assets/openapi.yml | 50 +++++++++++++++++++ ...ker-compose.yml => docker-compose.dev.yml} | 0 ...-compose.prod.yaml => docker-compose.yaml} | 6 ++- build/package/Dockerfile.decoder | 1 + 4 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 assets/openapi.yml rename build/{docker-compose.yml => docker-compose.dev.yml} (100%) rename build/{docker-compose.prod.yaml => docker-compose.yaml} (96%) diff --git a/assets/openapi.yml b/assets/openapi.yml new file mode 100644 index 0000000..6e770a2 --- /dev/null +++ b/assets/openapi.yml @@ -0,0 +1,50 @@ +openapi: 3.0.0 +info: + title: Beacon Parser API + version: 1.0.0 +paths: + /configs/beacons: + get: + summary: Retrieve beacon parsing configurations + responses: + '200': + description: A list of beacon protocol definitions + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/BeaconConfig' + +components: + schemas: + BeaconConfig: + type: object + properties: + name: + type: string + example: "Ingics" + min: + type: integer + max: + type: integer + pattern: + type: array + items: + type: string + example: ["0xFF", "0x59"] + configs: + type: object + additionalProperties: + $ref: '#/components/schemas/FieldMapping' + + FieldMapping: + type: object + properties: + offset: + type: integer + length: + type: integer + order: + type: string + enum: [littleendian, bigendian] \ No newline at end of file diff --git a/build/docker-compose.yml b/build/docker-compose.dev.yml similarity index 100% rename from build/docker-compose.yml rename to build/docker-compose.dev.yml diff --git a/build/docker-compose.prod.yaml b/build/docker-compose.yaml similarity index 96% rename from build/docker-compose.prod.yaml rename to build/docker-compose.yaml index 93ce5ad..05cd347 100644 --- a/build/docker-compose.prod.yaml +++ b/build/docker-compose.yaml @@ -94,6 +94,10 @@ services: environment: - VALKEY_URL=valkey:6379 - KAFKA_URL=kafka:29092 + - DBHost=db + - DBUser=postgres + - DBPass=postgres + - DBName=postgres ports: - "127.0.0.1:1902:1902" depends_on: @@ -113,7 +117,7 @@ services: container_name: presense-bridge environment: - KAFKA_URL=kafka:29092 - - MQTT_HOST=192.168.1.101:1883 + - MQTT_HOST=192.168.1.101 - MQTT_USERNAME=user - MQTT_PASSWORD=pass depends_on: diff --git a/build/package/Dockerfile.decoder b/build/package/Dockerfile.decoder index 1dc4338..1f12ce6 100644 --- a/build/package/Dockerfile.decoder +++ b/build/package/Dockerfile.decoder @@ -13,5 +13,6 @@ FROM alpine:latest RUN apk add --no-cache ca-certificates WORKDIR /app COPY --from=builder /app/decoder . +COPY --from=builder /app/cmd/decoder/config.json ./cmd/decoder/config.json ENTRYPOINT ["./decoder"]