Skip to content

Commit

Permalink
Release 2.0.4 (#101,#140,#147,#148)
Browse files Browse the repository at this point in the history
  • Loading branch information
aceberg committed Oct 20, 2024
1 parent 6ab2797 commit 638e57b
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 15 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/dev-docker-io.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/main-docker-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
# 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)

### 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
Expand Down
19 changes: 15 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down Expand Up @@ -58,6 +55,20 @@ Web GUI should be at http://localhost:8840

</details>

## Install on Linux

<details>
<summary>Expand</summary>

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)

</details>

## Config
<details>
<summary>Expand</summary>
Expand Down
4 changes: 2 additions & 2 deletions internal/web/public/js/sort.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down

0 comments on commit 638e57b

Please sign in to comment.