From 131efe7f360cbb8236c7bd40e92f4b7f90de35a4 Mon Sep 17 00:00:00 2001 From: aceberg <1502200+aceberg@users.noreply.github.com> Date: Tue, 25 Mar 2025 13:44:26 +0700 Subject: [PATCH] Release 2.1.0 (#180,#181) --- CHANGELOG.md | 5 +++-- README.md | 2 +- docker-compose-local.yml | 25 ------------------------- docker-compose.yml | 27 +++++++++++++++++++-------- go.mod | 4 ++-- go.sum | 12 ++++++------ internal/web/public/version | 2 +- 7 files changed, 32 insertions(+), 45 deletions(-) delete mode 100644 docker-compose-local.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index d625451..a856b3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ # Change Log All notable changes to this project will be documented in this file. -## [v2.1.0] - 2025- +## [v2.1.0] - 2025-03-25 ### Added -- Rewrited GUI in SolidJS and TypeScript +- Rewrited GUI in `SolidJS` and `TypeScript` - Prometheus integration [#181](https://github.com/aceberg/WatchYourLAN/pull/181) +- Optimized Docker build [#180](https://github.com/aceberg/WatchYourLAN/pull/180) ### Fixed - Vite: file names diff --git a/README.md b/README.md index 2c64dbc..8cdf8d1 100644 --- a/README.md +++ b/README.md @@ -190,7 +190,7 @@ docker run --name wyl \ -v $DOCKERDATAPATH/wyl:/data/WatchYourLAN \ aceberg/watchyourlan -n "http://$YOUR_IP:8850" ``` -Or use [docker-compose](docker-compose-local.yml) +Or use [docker-compose](docker-compose.yml) diff --git a/docker-compose-local.yml b/docker-compose-local.yml deleted file mode 100644 index eadec75..0000000 --- a/docker-compose-local.yml +++ /dev/null @@ -1,25 +0,0 @@ -version: "3" -services: - node-bootstrap: - image: aceberg/node-bootstrap - restart: unless-stopped - ports: - - 8850:8850 - wyl: - image: aceberg/watchyourlan - network_mode: "host" - restart: unless-stopped - command: "-n http://YOUR_IP:8850" # put your server IP or DNS name here - depends_on: - - node-bootstrap - volumes: - - ~/.dockerdata/wyl:/data/WatchYourLAN - environment: - TZ: Asia/Novosibirsk # required: needs your TZ for correct time - IFACES: "enp4s0 wlxf4ec3892dd51" # required: 1 or more interface - HOST: "0.0.0.0" # optional, default: 0.0.0.0 - PORT: "8840" # optional, default: 8840 - TIMEOUT: "120" # optional, time in seconds, default: 120 - SHOUTRRR_URL: "" # optional, set url to notify - THEME: "sand" # optional - COLOR: "dark" # optional \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 6dbce7b..d6ea9f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,17 +1,28 @@ version: "3" services: + # node-bootstrap: # optional, local themes and icons + # image: aceberg/node-bootstrap # dockerhub + # # image: ghcr.io/aceberg/node-bootstrap # or github + # restart: unless-stopped + # ports: + # - 8850:8850 wyl: - image: aceberg/watchyourlan - network_mode: "host" + image: aceberg/watchyourlan # dockerhub + # image: ghcr.io/aceberg/watchyourlan # or github + network_mode: "host" restart: unless-stopped + # uncomment those if you are using local node-bootstrap: + # command: "-n http://YOUR_IP:8850" # put your server IP or DNS name here + # depends_on: + # - node-bootstrap volumes: - ~/.dockerdata/wyl:/data/WatchYourLAN environment: TZ: Asia/Novosibirsk # required: needs your TZ for correct time IFACES: "enp4s0 wlxf4ec3892dd51" # required: 1 or more interface - HOST: "0.0.0.0" # optional, default: 0.0.0.0 - PORT: "8840" # optional, default: 8840 - TIMEOUT: "120" # optional, time in seconds, default: 120 - SHOUTRRR_URL: "" # optional, set url to notify - THEME: "sand" # optional - COLOR: "dark" # optional \ No newline at end of file + # HOST: "0.0.0.0" # optional, default: 0.0.0.0 + # PORT: "8840" # optional, default: 8840 + # TIMEOUT: "120" # optional, time in seconds, default: 120 + # SHOUTRRR_URL: "" # optional, set url to notify + # THEME: "sand" # optional + # COLOR: "dark" # optional \ No newline at end of file diff --git a/go.mod b/go.mod index 2c785c2..68c8b26 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/lib/pq v1.10.9 github.com/prometheus/client_golang v1.21.1 github.com/spf13/viper v1.20.0 - modernc.org/sqlite v1.36.1 + modernc.org/sqlite v1.36.2 ) require ( @@ -63,7 +63,7 @@ require ( golang.org/x/crypto v0.32.0 // indirect golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 // indirect golang.org/x/net v0.33.0 // indirect - golang.org/x/sys v0.30.0 // indirect + golang.org/x/sys v0.31.0 // indirect golang.org/x/text v0.21.0 // indirect google.golang.org/protobuf v1.36.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 44eb907..eb18007 100644 --- a/go.sum +++ b/go.sum @@ -58,8 +58,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo= -github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs= +github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/influxdata/influxdb-client-go/v2 v2.14.0 h1:AjbBfJuq+QoaXNcrova8smSjwJdUHnwvfjMF71M1iI4= @@ -176,8 +176,8 @@ golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= -golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= @@ -208,8 +208,8 @@ modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8= modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns= modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w= modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE= -modernc.org/sqlite v1.36.1 h1:bDa8BJUH4lg6EGkLbahKe/8QqoF8p9gArSc6fTqYhyQ= -modernc.org/sqlite v1.36.1/go.mod h1:7MPwH7Z6bREicF9ZVUR78P1IKuxfZ8mRIDHD0iD+8TU= +modernc.org/sqlite v1.36.2 h1:vjcSazuoFve9Wm0IVNHgmJECoOXLZM1KfMXbcX2axHA= +modernc.org/sqlite v1.36.2/go.mod h1:ADySlx7K4FdY5MaJcEv86hTJ0PjedAloTUuif0YS3ws= modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= diff --git a/internal/web/public/version b/internal/web/public/version index f729457..17b9e92 100644 --- a/internal/web/public/version +++ b/internal/web/public/version @@ -1 +1 @@ -VERSION=2.0.4 \ No newline at end of file +VERSION=2.1.0 \ No newline at end of file