From f234497162b5cd0221cfdc7394bc05f42c04f335 Mon Sep 17 00:00:00 2001
From: maze <maze@maze.io>
Date: Mon, 23 Feb 2026 21:21:23 +0100
Subject: [PATCH] Refactor

---
 .gitea/workflows/build.yaml         | 20 ++++++++++++--------
 cmd/hamview-collector/Dockerfile    | 14 +++++++++-----
 cmd/hamview-collector/entrypoint.sh | 10 ++++++++++
 cmd/hamview-receiver/Dockerfile     |  2 +-
 4 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100755 cmd/hamview-collector/entrypoint.sh

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index c9a58c6..6274070 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -7,6 +7,7 @@ permissions:
 
 jobs:
   test:
+    name: Test and lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
@@ -14,11 +15,14 @@ jobs:
         with:
           go-version-file: 'go.mod'
           check-latest: false
-      #- name: golangci-lint
-      #  uses: golangci/golangci-lint-action@v9
-      #  with:
-      #    go-version: ${{ matrix.go }}
-      #    version: v2.6
+      - name: Test
+        run:  go test -v ./...
+      - name: Lint
+        uses: golangci/golangci-lint-action@v9
+        with:
+          go-version: ${{ matrix.go }}
+          version: v2.6
+        if: ${{ github.actor != 'maze' }}
 
   build_collector:
     name: Build collector
@@ -83,7 +87,7 @@ jobs:
           GOARCH: amd64
         run:  |
           GOOS=$GOOS GOARCH=$GOARCH \
-            go build -o build/hamview-receiver-$GOARCH cmd/hamview-receiver && \
+            go build -o build/hamview-receiver-$GOARCH ./cmd/hamview-receiver && \
             readlink -f build/hamview-receiver-$GOARCH
       - name: Build arm6
         env:
@@ -92,7 +96,7 @@ jobs:
           GOARM:  6
         run:  |
           GOOS=$GOOS GOARCH=$GOARCH GOARM=$GOARM \
-            go build -o build/hamview-receiver-$GOARCH$GOARM cmd/hamview-receiver && \
+            go build -o build/hamview-receiver-$GOARCH$GOARM ./cmd/hamview-receiver && \
             readlink -f build/hamview-receiver-$GOARCH$GOARM
       - name: Build arm7
         env:
@@ -101,7 +105,7 @@ jobs:
           GOARM:  7
         run:  |
           GOOS=$GOOS GOARCH=$GOARCH GOARM=$GOARM \
-            go build -o build/hamview-receiver-$GOARCH$GOARM cmd/hamview-receiver && \
+            go build -o build/hamview-receiver-$GOARCH$GOARM ./cmd/hamview-receiver && \
             readlink -f build/hamview-receiver-$GOARCH$GOARM
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
diff --git a/cmd/hamview-collector/Dockerfile b/cmd/hamview-collector/Dockerfile
index d8f77a2..186a6f8 100644
--- a/cmd/hamview-collector/Dockerfile
+++ b/cmd/hamview-collector/Dockerfile
@@ -1,6 +1,10 @@
 FROM        alpine:3
-COPY        ./etc /etc/hamview
-COPY        ./build/hamview-collector /opt/hamview/bin/hamview-collector
-WORKDIR     /opt/hamview
-ENTRYPOINT  ["bin/hamview-collector"]
-CMD         [ "--config", "/etc/hamview/hamview-collector.yaml" ]
+RUN         apk add --no-cache dumb-init=1.2.5-r3
+
+WORKDIR     /app
+
+COPY        ./etc /app/config
+COPY        ./build/hamview-collector /app/hamview-collector
+COPY        ./cmd/hamview-collector/entrypoint.sh /entrypoint.sh
+
+ENTRYPOINT  ["dumb-init", "/entrypoint.sh"]
diff --git a/cmd/hamview-collector/entrypoint.sh b/cmd/hamview-collector/entrypoint.sh
new file mode 100755
index 0000000..23994ff
--- /dev/null
+++ b/cmd/hamview-collector/entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+case "$@" in
+    "")
+        exec "/app/hamview-receiver" --config "/app/config/hamview-collector.yaml" ;;
+        ;;
+    *)
+        exec "/bin/sh" -c "$@"
+        ;;
+esac
diff --git a/cmd/hamview-receiver/Dockerfile b/cmd/hamview-receiver/Dockerfile
index aa1412a..615c226 100644
--- a/cmd/hamview-receiver/Dockerfile
+++ b/cmd/hamview-receiver/Dockerfile
@@ -7,6 +7,6 @@ ARG         TARGETARCH
 ARG         TARGETVARIANT
 COPY        ./etc /app/config
 COPY        ./build/hamview-receiver-${TARGETARCH}${TARGETVARIANT#v} /app/hamview-receiver
-COPY        ./entrypoint.sh /entrypoint.sh
+COPY        ./cmd/hamview-receiver/entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT  ["dumb-init", "/entrypoint.sh"]