From baea1cc4ebb088b061f4fc650ce3a0dfebe87919 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Tue, 4 Mar 2025 08:29:17 +0100 Subject: [PATCH 01/13] added wud --- wud/.env | 1 + wud/docker-compose.yml | 11 +++++++++++ wud/stack.env | 5 +++++ 3 files changed, 17 insertions(+) create mode 100644 wud/.env create mode 100644 wud/docker-compose.yml create mode 100644 wud/stack.env diff --git a/wud/.env b/wud/.env new file mode 100644 index 0000000..42f1b42 --- /dev/null +++ b/wud/.env @@ -0,0 +1 @@ +VERSION=4.10.1 \ No newline at end of file diff --git a/wud/docker-compose.yml b/wud/docker-compose.yml new file mode 100644 index 0000000..8772bdb --- /dev/null +++ b/wud/docker-compose.yml @@ -0,0 +1,11 @@ +services: + whatsupdocker: + image: getwud/wud + container_name: wud + env_file: + - stack.env + volumes: + - /var/run/docker.sock:/var/run/docker.sock + ports: + - 3008:3000 + \ No newline at end of file diff --git a/wud/stack.env b/wud/stack.env new file mode 100644 index 0000000..083c2f9 --- /dev/null +++ b/wud/stack.env @@ -0,0 +1,5 @@ +WUD_AUTH_OIDC_AUTHENTIK_CLIENTID=p8WUIAWMMx2mRdsnjZdkMl5XXerZQfZFo6ZadAvH +WUD_AUTH_OIDC_AUTHENTIK_CLIENTSECRET=ApAQrTyl2qVIsxhHY1MYJkxCS5tHjQz2gKnmDTOgGALeVCxiN9upQP1h28VqqAaOtc6WEDsczhsk1hKFvit1WUe8mbk0BkGQc2Mnh0Hf2MRybXd1vDcTRWL6pqICywBs +WUD_AUTH_OIDC_AUTHENTIK_DISCOVERY=https://auth.sectorq.eu/application/o/wud/.well-known/openid-configuration +WUD_AUTH_OIDC_AUTHENTIK_REDIRECT=false +WUD_AUTH_OIDC_AUTHENTIK_TIMEOUT=2000 \ No newline at end of file From 7b1b1f4ef5939b2738ed694fd709002646a8e7bc Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Tue, 4 Mar 2025 08:38:44 +0100 Subject: [PATCH 02/13] added wud --- wud/stack.env | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wud/stack.env b/wud/stack.env index 083c2f9..0553e12 100644 --- a/wud/stack.env +++ b/wud/stack.env @@ -2,4 +2,8 @@ WUD_AUTH_OIDC_AUTHENTIK_CLIENTID=p8WUIAWMMx2mRdsnjZdkMl5XXerZQfZFo6ZadAvH WUD_AUTH_OIDC_AUTHENTIK_CLIENTSECRET=ApAQrTyl2qVIsxhHY1MYJkxCS5tHjQz2gKnmDTOgGALeVCxiN9upQP1h28VqqAaOtc6WEDsczhsk1hKFvit1WUe8mbk0BkGQc2Mnh0Hf2MRybXd1vDcTRWL6pqICywBs WUD_AUTH_OIDC_AUTHENTIK_DISCOVERY=https://auth.sectorq.eu/application/o/wud/.well-known/openid-configuration WUD_AUTH_OIDC_AUTHENTIK_REDIRECT=false -WUD_AUTH_OIDC_AUTHENTIK_TIMEOUT=2000 \ No newline at end of file +WUD_AUTH_OIDC_AUTHENTIK_TIMEOUT=2000 + +WUD_TRIGGER_GOTIFY_EXTERNAL_PRIORITY=1 +WUD_TRIGGER_GOTIFY_EXTERNAL_TOKEN=AjmU9gGFMrbmQtb +WUD_TRIGGER_GOTIFY_EXTERNAL_URL=https://gotify.sectorq.eu/ \ No newline at end of file From 8e4c8481ae4f25a09317d9319488d2b8d137423b Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Tue, 4 Mar 2025 09:01:47 +0100 Subject: [PATCH 03/13] added wud --- wud/docker-compose.yml | 2 ++ wud/stack.env | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/wud/docker-compose.yml b/wud/docker-compose.yml index 8772bdb..6a8cf5f 100644 --- a/wud/docker-compose.yml +++ b/wud/docker-compose.yml @@ -6,6 +6,8 @@ services: - stack.env volumes: - /var/run/docker.sock:/var/run/docker.sock + - /share/docker_data/wud/data:/store + - /share/docker_data/wud/certs:/certs ports: - 3008:3000 \ No newline at end of file diff --git a/wud/stack.env b/wud/stack.env index 0553e12..dc19ea6 100644 --- a/wud/stack.env +++ b/wud/stack.env @@ -1,9 +1,26 @@ +TZ=Europe/Bratislava + +# AUTHENTIK WUD_AUTH_OIDC_AUTHENTIK_CLIENTID=p8WUIAWMMx2mRdsnjZdkMl5XXerZQfZFo6ZadAvH WUD_AUTH_OIDC_AUTHENTIK_CLIENTSECRET=ApAQrTyl2qVIsxhHY1MYJkxCS5tHjQz2gKnmDTOgGALeVCxiN9upQP1h28VqqAaOtc6WEDsczhsk1hKFvit1WUe8mbk0BkGQc2Mnh0Hf2MRybXd1vDcTRWL6pqICywBs WUD_AUTH_OIDC_AUTHENTIK_DISCOVERY=https://auth.sectorq.eu/application/o/wud/.well-known/openid-configuration WUD_AUTH_OIDC_AUTHENTIK_REDIRECT=false WUD_AUTH_OIDC_AUTHENTIK_TIMEOUT=2000 +# GOTIFY WUD_TRIGGER_GOTIFY_EXTERNAL_PRIORITY=1 WUD_TRIGGER_GOTIFY_EXTERNAL_TOKEN=AjmU9gGFMrbmQtb -WUD_TRIGGER_GOTIFY_EXTERNAL_URL=https://gotify.sectorq.eu/ \ No newline at end of file +WUD_TRIGGER_GOTIFY_EXTERNAL_URL=https://gotify.sectorq.eu/ + +WUD_TRIGGER_GOTIFY_EXTERNAL_MODE=batch + + +# error info debug trace +WUD_LOG_LEVEL=error +# text json +WUD_LOG_FORMAT=text + +WUD_WATCHER_EXTDOCKER_HOST=193.168.144.164:2376 +WUD_WATCHER_EXTDOCKER_CERTFILE=/certs/cert.pem +WUD_WATCHER_EXTDOCKER_CAFILE=/certs/ca.pem +WUD_WATCHER_EXTDOCKER_KEYFILE=/certs/key.pem \ No newline at end of file From 6c6815eb99ea4789e00739fd6210c63e576fbdb1 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Tue, 4 Mar 2025 09:05:50 +0100 Subject: [PATCH 04/13] added wud --- wud/stack.env | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wud/stack.env b/wud/stack.env index dc19ea6..8174e5c 100644 --- a/wud/stack.env +++ b/wud/stack.env @@ -23,4 +23,7 @@ WUD_LOG_FORMAT=text WUD_WATCHER_EXTDOCKER_HOST=193.168.144.164:2376 WUD_WATCHER_EXTDOCKER_CERTFILE=/certs/cert.pem WUD_WATCHER_EXTDOCKER_CAFILE=/certs/ca.pem -WUD_WATCHER_EXTDOCKER_KEYFILE=/certs/key.pem \ No newline at end of file +WUD_WATCHER_EXTDOCKER_KEYFILE=/certs/key.pem + + +WUD_WATCHER_MSERVER_SOCKET=/var/run/docker.sock \ No newline at end of file From ca1e421d9fd143210a43998fa5b2f55aaa0b4a7b Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Tue, 4 Mar 2025 09:18:49 +0100 Subject: [PATCH 05/13] added wud --- wud/stack.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wud/stack.env b/wud/stack.env index 8174e5c..fdb664c 100644 --- a/wud/stack.env +++ b/wud/stack.env @@ -16,7 +16,7 @@ WUD_TRIGGER_GOTIFY_EXTERNAL_MODE=batch # error info debug trace -WUD_LOG_LEVEL=error +WUD_LOG_LEVEL=debug # text json WUD_LOG_FORMAT=text From 09387c62301b5eb63db7e4b50477a0c1cff44f1d Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Tue, 4 Mar 2025 09:20:21 +0100 Subject: [PATCH 06/13] added wud --- wud/stack.env | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wud/stack.env b/wud/stack.env index fdb664c..cb4850c 100644 --- a/wud/stack.env +++ b/wud/stack.env @@ -20,7 +20,8 @@ WUD_LOG_LEVEL=debug # text json WUD_LOG_FORMAT=text -WUD_WATCHER_EXTDOCKER_HOST=193.168.144.164:2376 +WUD_WATCHER_EXTDOCKER_HOST=193.168.144.164 +WUD_WATCHER_EXTDOCKER_PORT=2376 WUD_WATCHER_EXTDOCKER_CERTFILE=/certs/cert.pem WUD_WATCHER_EXTDOCKER_CAFILE=/certs/ca.pem WUD_WATCHER_EXTDOCKER_KEYFILE=/certs/key.pem From b15766a8de55769b98522d91646a4a6a1547f109 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Tue, 4 Mar 2025 09:24:09 +0100 Subject: [PATCH 07/13] added wud --- wud/stack.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wud/stack.env b/wud/stack.env index cb4850c..ee1c0b7 100644 --- a/wud/stack.env +++ b/wud/stack.env @@ -25,6 +25,6 @@ WUD_WATCHER_EXTDOCKER_PORT=2376 WUD_WATCHER_EXTDOCKER_CERTFILE=/certs/cert.pem WUD_WATCHER_EXTDOCKER_CAFILE=/certs/ca.pem WUD_WATCHER_EXTDOCKER_KEYFILE=/certs/key.pem - +WUD_WATCHER_EXTDOCKER_CRON=*/5 * * * * WUD_WATCHER_MSERVER_SOCKET=/var/run/docker.sock \ No newline at end of file From 67fc81907baa59458e30d662c216627491069d18 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Tue, 4 Mar 2025 10:04:13 +0100 Subject: [PATCH 08/13] added wud --- wud/stack.env | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/wud/stack.env b/wud/stack.env index ee1c0b7..5927bcb 100644 --- a/wud/stack.env +++ b/wud/stack.env @@ -22,9 +22,14 @@ WUD_LOG_FORMAT=text WUD_WATCHER_EXTDOCKER_HOST=193.168.144.164 WUD_WATCHER_EXTDOCKER_PORT=2376 -WUD_WATCHER_EXTDOCKER_CERTFILE=/certs/cert.pem -WUD_WATCHER_EXTDOCKER_CAFILE=/certs/ca.pem -WUD_WATCHER_EXTDOCKER_KEYFILE=/certs/key.pem -WUD_WATCHER_EXTDOCKER_CRON=*/5 * * * * +WUD_WATCHER_EXTDOCKER_CERTFILE=/certs/ext/cert.pem +WUD_WATCHER_EXTDOCKER_CAFILE=/certs/ext/ca.pem +WUD_WATCHER_EXTDOCKER_KEYFILE=/certs/ext/key.pem +WUD_WATCHER_EXTDOCKER_CRON=0 * * * * -WUD_WATCHER_MSERVER_SOCKET=/var/run/docker.sock \ No newline at end of file +WUD_WATCHER_MSERVER_HOST=192.168.77.101 +WUD_WATCHER_MSERVER_PORT=2376 +WUD_WATCHER_MSERVER_CERTFILE=/certs/m-server/cert.pem +WUD_WATCHER_MSERVER_CAFILE=/certs/m-server/ca.pem +WUD_WATCHER_MSERVER_KEYFILE=/certs/m-server/key.pem +WUD_WATCHER_MSERVER_CRON=*/5 * * * * \ No newline at end of file From c2ba24cab6153ab5e1103f1d675810aeb209a34d Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Tue, 4 Mar 2025 10:06:17 +0100 Subject: [PATCH 09/13] added wud --- wud/stack.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wud/stack.env b/wud/stack.env index 5927bcb..012fc33 100644 --- a/wud/stack.env +++ b/wud/stack.env @@ -32,4 +32,4 @@ WUD_WATCHER_MSERVER_PORT=2376 WUD_WATCHER_MSERVER_CERTFILE=/certs/m-server/cert.pem WUD_WATCHER_MSERVER_CAFILE=/certs/m-server/ca.pem WUD_WATCHER_MSERVER_KEYFILE=/certs/m-server/key.pem -WUD_WATCHER_MSERVER_CRON=*/5 * * * * \ No newline at end of file +WUD_WATCHER_MSERVER_CRON=0 * * * * \ No newline at end of file From 746deb59394aa3048d8fb9aa8154d2f36211d0da Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Tue, 4 Mar 2025 10:10:24 +0100 Subject: [PATCH 10/13] added wud --- wud/stack.env | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wud/stack.env b/wud/stack.env index 012fc33..29a31cd 100644 --- a/wud/stack.env +++ b/wud/stack.env @@ -1,4 +1,7 @@ TZ=Europe/Bratislava +WUD_REGISTRY_HUB_PUBLIC_LOGIN=jaydee@sectorq.eu +WUD_REGISTRY_HUB_PUBLIC_PASSWORD=l4c1j4yd33Du5lo + # AUTHENTIK WUD_AUTH_OIDC_AUTHENTIK_CLIENTID=p8WUIAWMMx2mRdsnjZdkMl5XXerZQfZFo6ZadAvH From c5e85742d158b18b11817aed543b2ec2f5bacce1 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Tue, 4 Mar 2025 10:44:11 +0100 Subject: [PATCH 11/13] added wud --- wud/stack.env | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wud/stack.env b/wud/stack.env index 29a31cd..c4c723a 100644 --- a/wud/stack.env +++ b/wud/stack.env @@ -3,6 +3,7 @@ WUD_REGISTRY_HUB_PUBLIC_LOGIN=jaydee@sectorq.eu WUD_REGISTRY_HUB_PUBLIC_PASSWORD=l4c1j4yd33Du5lo + # AUTHENTIK WUD_AUTH_OIDC_AUTHENTIK_CLIENTID=p8WUIAWMMx2mRdsnjZdkMl5XXerZQfZFo6ZadAvH WUD_AUTH_OIDC_AUTHENTIK_CLIENTSECRET=ApAQrTyl2qVIsxhHY1MYJkxCS5tHjQz2gKnmDTOgGALeVCxiN9upQP1h28VqqAaOtc6WEDsczhsk1hKFvit1WUe8mbk0BkGQc2Mnh0Hf2MRybXd1vDcTRWL6pqICywBs @@ -29,10 +30,14 @@ WUD_WATCHER_EXTDOCKER_CERTFILE=/certs/ext/cert.pem WUD_WATCHER_EXTDOCKER_CAFILE=/certs/ext/ca.pem WUD_WATCHER_EXTDOCKER_KEYFILE=/certs/ext/key.pem WUD_WATCHER_EXTDOCKER_CRON=0 * * * * +WUD_WATCHER_EXTDOCKER_WATCHALL=true +WUD_WATCHER_EXTDOCKER_WATCHBYDEFAULT=true WUD_WATCHER_MSERVER_HOST=192.168.77.101 WUD_WATCHER_MSERVER_PORT=2376 WUD_WATCHER_MSERVER_CERTFILE=/certs/m-server/cert.pem WUD_WATCHER_MSERVER_CAFILE=/certs/m-server/ca.pem WUD_WATCHER_MSERVER_KEYFILE=/certs/m-server/key.pem -WUD_WATCHER_MSERVER_CRON=0 * * * * \ No newline at end of file +WUD_WATCHER_MSERVER_CRON=0 * * * * +WUD_WATCHER_MSERVER_WATCHALL=true +WUD_WATCHER_MSERVER_WATCHBYDEFAULT=true \ No newline at end of file From 340ca008fb2ed4563c2f790d3e31fb8440b13b6f Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Tue, 4 Mar 2025 10:49:06 +0100 Subject: [PATCH 12/13] added wud --- wud/stack.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wud/stack.env b/wud/stack.env index c4c723a..a6d59aa 100644 --- a/wud/stack.env +++ b/wud/stack.env @@ -18,7 +18,7 @@ WUD_TRIGGER_GOTIFY_EXTERNAL_URL=https://gotify.sectorq.eu/ WUD_TRIGGER_GOTIFY_EXTERNAL_MODE=batch - +WUD_TRIGGER_DOCKER_UPDATE_PRUNE # error info debug trace WUD_LOG_LEVEL=debug # text json From df29b6cefab489b74eb272ccf2587a366d453a16 Mon Sep 17 00:00:00 2001 From: "ladislav.dusa" Date: Tue, 4 Mar 2025 10:49:27 +0100 Subject: [PATCH 13/13] added wud --- wud/stack.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wud/stack.env b/wud/stack.env index a6d59aa..14efc43 100644 --- a/wud/stack.env +++ b/wud/stack.env @@ -18,7 +18,7 @@ WUD_TRIGGER_GOTIFY_EXTERNAL_URL=https://gotify.sectorq.eu/ WUD_TRIGGER_GOTIFY_EXTERNAL_MODE=batch -WUD_TRIGGER_DOCKER_UPDATE_PRUNE +WUD_TRIGGER_DOCKER_UPDATE_PRUNE=true # error info debug trace WUD_LOG_LEVEL=debug # text json