diff --git a/.github/workflows/dev-docker-io.yml b/.github/workflows/dev-docker-io.yml index d2ef3b7..f8634f8 100644 --- a/.github/workflows/dev-docker-io.yml +++ b/.github/workflows/dev-docker-io.yml @@ -16,14 +16,14 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - # - name: Build and Push Docker Image to docker.io - # uses: mr-smithers-excellent/docker-build-push@v6 - # with: - # image: ${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }} - # tags: ${{ env.TAGS }} - # registry: docker.io - # username: ${{ secrets.DOCKER_USERNAME }} - # password: ${{ secrets.DOCKER_PASSWORD }} + - name: Build and Push Docker Image to docker.io + uses: mr-smithers-excellent/docker-build-push@v6 + with: + image: ${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }} + tags: ${{ env.TAGS }} + registry: docker.io + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} - name: Login to GHCR uses: docker/login-action@v3 diff --git a/.github/workflows/main-docker-all.yml b/.github/workflows/main-docker-all.yml index 50c5407..0b99c32 100644 --- a/.github/workflows/main-docker-all.yml +++ b/.github/workflows/main-docker-all.yml @@ -52,6 +52,8 @@ jobs: push: true tags: | ${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:v2 + ${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:latest ${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }} ghcr.io/${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:v2 + ghcr.io/${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:latest ghcr.io/${{ secrets.DOCKER_USERNAME }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 678054c..47aae85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Change Log All notable changes to this project will be documented in this file. -## [v2.0.4] - 2024- +## [v2.0.4] - 2024-10-21 ### Added - Notification test [#147](https://github.com/aceberg/WatchYourLAN/issues/147) - API status [#148](https://github.com/aceberg/WatchYourLAN/issues/148) @@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. ### Fixed - [#101](https://github.com/aceberg/WatchYourLAN/issues/101) - The same problem for Theme, Color mode, Log level +- Sort bug in Chrome [#140](https://github.com/aceberg/WatchYourLAN/issues/140) ## [v2.0.3] - 2024-09-17 ### Fixed diff --git a/README.md b/README.md index dad3fdf..9ec514b 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,7 @@ Lightweight network IP scanner with web GUI. Features: - Send data to `InfluxDB2` to make a `Grafana` dashboard > [!WARNING] -> This is version 2.0. Version 1.0 can be found in this branch: [v1](https://github.com/aceberg/WatchYourLAN/tree/v1) - -> [!CAUTION] -> **BREAKING CHANGES!** Version 2.0 is not compatible with v1.0. For now v2.0 docker images will be released under `v2` tag. It will be tagged `latest` in a few weeks (probably, in October). +> This is version 2.0, which is now tagged `latest`. Version 1.0 can be found in this branch: [v1](https://github.com/aceberg/WatchYourLAN/tree/v1). **BREAKING CHANGES!** Version 2.0 is not compatible with v1.0. > [!TIP] > WatchYourLAN supports `vlan`s, `docker0` and other complicated scans since `v2.0.1`. How-to [here](https://github.com/aceberg/WatchYourLAN/blob/main/docs/VLAN_ARP_SCAN.md). @@ -58,6 +55,20 @@ Web GUI should be at http://localhost:8840 +## Install on Linux + +
+ Expand + +All binary packages can be found in [latest](https://github.com/aceberg/WatchYourLAN/releases/latest) release. There are `.deb`, `.rpm`, `.apk` (Alpine Linux) and `.tar.gz` files. + +Supported architectures: `amd64`, `i386`, `arm_v5`, `arm_v6`, `arm_v7`. +Dependencies: `arp-scan`, `tzdata`. + +For `amd64` there is a `deb` repo [available](https://github.com/aceberg/ppa) + +
+ ## Config
Expand diff --git a/internal/web/public/js/sort.js b/internal/web/public/js/sort.js index 0f7f4cf..9354569 100644 --- a/internal/web/public/js/sort.js +++ b/internal/web/public/js/sort.js @@ -26,9 +26,9 @@ function sortByAny(someArray) { function byField(a, b, fieldName, down){ if (a[fieldName] > b[fieldName]) { - return down; + return down ? 1 : -1; } else { - return !down; + return !down ? 1 : -1; } }