From dce8c34064f4b66ff3d222fd64506b248ac03a15 Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Sun, 10 Aug 2025 20:22:43 +1000 Subject: [PATCH] docs, rewrite docker image --- .github/workflows/docker_rewrite.yml | 81 ++++++++++++++++++++++++++++ docs/DEVICE_HEURISTICS.md | 3 ++ 2 files changed, 84 insertions(+) create mode 100755 .github/workflows/docker_rewrite.yml diff --git a/.github/workflows/docker_rewrite.yml b/.github/workflows/docker_rewrite.yml new file mode 100755 index 00000000..72e0a835 --- /dev/null +++ b/.github/workflows/docker_rewrite.yml @@ -0,0 +1,81 @@ +name: docker + +on: + push: + branches: + - rewrite + tags: + - '*.*.*' + pull_request: + branches: + - rewrite + +jobs: + docker_dev: + runs-on: ubuntu-latest + timeout-minutes: 30 + permissions: + contents: read + packages: write + if: > + contains(github.event.head_commit.message, 'PUSHPROD') != 'True' && + github.repository == 'jokob-sk/NetAlertX' + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Set up dynamic build ARGs + id: getargs + run: echo "version=$(cat ./stable/VERSION)" >> $GITHUB_OUTPUT + + - name: Get release version + id: get_version + run: echo "version=Dev" >> $GITHUB_OUTPUT + + - name: Create .VERSION file + run: echo "${{ steps.get_version.outputs.version }}" >> .VERSION + + - name: Docker meta + id: meta + uses: docker/metadata-action@v4 + with: + images: | + ghcr.io/jokob-sk/netalertx-dev-rewrite + jokobsk/netalertx-dev-rewrite + tags: | + type=raw,value=latest + type=ref,event=branch + type=ref,event=pr + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=semver,pattern={{major}} + type=sha + + - name: Log in to Github Container Registry (GHCR) + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: jokob-sk + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Log in to DockerHub + if: github.event_name != 'pull_request' + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and push + uses: docker/build-push-action@v3 + with: + context: . + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/docs/DEVICE_HEURISTICS.md b/docs/DEVICE_HEURISTICS.md index 082e56c0..e274aefc 100755 --- a/docs/DEVICE_HEURISTICS.md +++ b/docs/DEVICE_HEURISTICS.md @@ -53,6 +53,9 @@ The function `guess_device_attributes(...)` runs a series of matching functions 4. IP pattern → `match_ip()` 5. Final fallback → defaults defined in the `NEWDEV_devIcon` and `NEWDEV_devType` settings. +> [!NOTE] +> The app will try guessing the device type or icon if `devType` or `devIcon` are `""` or `"null"`. + ### Use of default values The guessing process runs for every device **as long as the current type or icon still matches the default values**. Even if earlier heuristics return a match, the system continues evaluating additional clues — like name or IP — to try and replace placeholders.