From 3106b2cf451d82074ff4ad52899d7946bca9900c Mon Sep 17 00:00:00 2001 From: maze Date: Tue, 24 Feb 2026 15:51:31 +0100 Subject: [PATCH] Add bash --- cmd/hamview-collector/Dockerfile | 2 +- cmd/hamview-collector/entrypoint.sh | 16 ++++++++++++++-- cmd/hamview-receiver/Dockerfile | 2 +- cmd/hamview-receiver/entrypoint.sh | 7 +++++-- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/cmd/hamview-collector/Dockerfile b/cmd/hamview-collector/Dockerfile index 186a6f8..b0ba975 100644 --- a/cmd/hamview-collector/Dockerfile +++ b/cmd/hamview-collector/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 -RUN apk add --no-cache dumb-init=1.2.5-r3 +RUN apk add --no-cache dumb-init=1.2.5-r3 bash=5.3.3-r1 WORKDIR /app diff --git a/cmd/hamview-collector/entrypoint.sh b/cmd/hamview-collector/entrypoint.sh index 23994ff..f987040 100755 --- a/cmd/hamview-collector/entrypoint.sh +++ b/cmd/hamview-collector/entrypoint.sh @@ -1,8 +1,20 @@ -#!/bin/sh +#!/bin/bash + +COLLECTOR_FLAGS=() +COLLECTOR_CONFIG="${COLLECTOR_CONFIG:-/app/config/collector.yaml}" + +[ -n "${COLLECTOR_DEBUG}" ] && COLLECTOR_FLAGS=("${COLLECTOR_FLAGS[@]}" "--debug") +[ -n "${COLLECTOR_TRACE}" ] && COLLECTOR_FLAGS=("${COLLECTOR_FLAGS[@]}" "--trace") + +run() { + exec "/app/hamview-collector" \ + "${COLLECTOR_FLAGS[@]}" \ + --config "${COLLECTOR_CONFIG}" +} case "$@" in "") - exec "/app/hamview-receiver" --config "/app/config/hamview-collector.yaml" ;; + run ;; *) exec "/bin/sh" -c "$@" diff --git a/cmd/hamview-receiver/Dockerfile b/cmd/hamview-receiver/Dockerfile index 615c226..e336e24 100644 --- a/cmd/hamview-receiver/Dockerfile +++ b/cmd/hamview-receiver/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 -RUN apk add --no-cache dumb-init=1.2.5-r3 +RUN apk add --no-cache dumb-init=1.2.5-r3 bash=5.3.3-r1 WORKDIR /app diff --git a/cmd/hamview-receiver/entrypoint.sh b/cmd/hamview-receiver/entrypoint.sh index 22a1ee9..0c5a8cb 100755 --- a/cmd/hamview-receiver/entrypoint.sh +++ b/cmd/hamview-receiver/entrypoint.sh @@ -1,7 +1,10 @@ #!/bin/bash -RECEIVER_FLAGS=("--debug") -RECEIVER_CONFIG="${RECEIVER_CONFIG:-/app/config/hamview-receiver-${RECEIVER_PROTOCOL}.yaml}" +RECEIVER_FLAGS=() +RECEIVER_CONFIG="${RECEIVER_CONFIG:-/app/config/receiver-${RECEIVER_PROTOCOL}.yaml}" + +[ -n "${RECEIVER_DEBUG}" ] && RECEIVER_FLAGS=("${RECEIVER_FLAGS[@]}" "--debug") +[ -n "${RECEIVER_TRACE}" ] && RECEIVER_FLAGS=("${RECEIVER_FLAGS[@]}" "--trace") run() { case "${RECEIVER_PROTOCOL}" in