From 9d55f21379163ef78bc73e105dac49b762d79378 Mon Sep 17 00:00:00 2001 From: J0nan Date: Sun, 17 Nov 2024 17:02:21 +0100 Subject: [PATCH 01/22] Added docker compose of qbittorrent with open VPN --- docker files/qBittorrent/docker-compose.yml | 50 +++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 docker files/qBittorrent/docker-compose.yml diff --git a/docker files/qBittorrent/docker-compose.yml b/docker files/qBittorrent/docker-compose.yml new file mode 100644 index 0000000..b963dcd --- /dev/null +++ b/docker files/qBittorrent/docker-compose.yml @@ -0,0 +1,50 @@ +services: + gluetun: + image: qmcgaw/gluetun:latest + cap_add: + - NET_ADMIN + environment: + # Documentation for different providers + # https://github.com/qdm12/gluetun-wiki/tree/main/setup/providers + - VPN_SERVICE_PROVIDER=PROVIDER # CHANGE ME + - VPN_TYPE=openvpn + - OPENVPN_USER=OPENVPN USER # CHANGE ME + - OPENVPN_PASSWORD=OPENVPN PASSWORD # CHANGE ME + # Execute the following command to get the list of servers, remember to change the provider + # docker run --rm qmcgaw/gluetun format-servers -yourprovider + - SERVER_REGIONS=SERVER REGION OR LIST OF SERVER REGIONS # CHANGE ME + # volumes: + # - /docker/appdata/gluetun:/config + ports: + - 10095:10095 # qbittorrent WebUI + - 6881:6881 # qbittorrent TCP + - 6881:6881/udp # qbittorrent UDP + deploy: + resources: + limits: + cpus: "2" + memory: "2g" + + qbittorrent: + image: lscr.io/linuxserver/qbittorrent:latest + container_name: qbittorrent + network_mode: service:gluetun # This is what makes the app to connect to the VPN. + # Note that all ports were moved to the gluetun app. + environment: + - PUID=568 + - PGID=568 + - TZ=Europe/Berlin + - WEBUI_PORT=10095 + - TORRENTING_PORT=6881 + volumes: + - /mnt/QBITTORRENT_DIR:/config # Directory you want to save your QBittorrent config files # CHANGE ME + - /mnt/MEDIA_DIR:/download # Directory of the downloads # CHANGE ME + deploy: + resources: + limits: + cpus: "2" + memory: "4g" + restart: unless-stopped + depends_on: + gluetun: + condition: service_healthy \ No newline at end of file From 9b5efc143a2238258338d758df15883e8b2bc0c1 Mon Sep 17 00:00:00 2001 From: J0nan Date: Wed, 1 Jan 2025 19:04:30 +0100 Subject: [PATCH 02/22] Changed folder name and added JDownloader 2 --- .gitignore | 2 + README.md | 15 +++++- docker-compose files/JDownloader2/README.md | 19 +++++++ .../JDownloader2/docker-compose.yml | 52 +++++++++++++++++++ docker-compose files/qBittorrent/README.md | 18 +++++++ .../qBittorrent/docker-compose.yml | 0 6 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 docker-compose files/JDownloader2/README.md create mode 100644 docker-compose files/JDownloader2/docker-compose.yml create mode 100644 docker-compose files/qBittorrent/README.md rename {docker files => docker-compose files}/qBittorrent/docker-compose.yml (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1539f4a --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +docker-compose files/JDownloader2/docker-compose_good.yml +docker-compose files/qBittorrent/docker-compose_good.yml diff --git a/README.md b/README.md index c2ca855..b105ee4 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,26 @@ # RandomThings +- [Docker files](#docker-files) + - [JDownloader 2](#jdownloader-2) + - [qBittorrent](#qbittorrent) - [Provisioning](#provisioning) - [Kali Linux](#kali-linux) - [Generic](#generic) +## Docker files + +### JDownloader 2 + +Docker compose that implements JDownloader 2 docker with VPN. [Info.](./docker-compose%20files/JDownloader2/) + +### qBittorrent + +Docker compose that implements qBittorrent docker with VPN. [Info.](./docker-compose%20files/qBittorrent) + ## Provisioning ### Kali Linux #### Generic -Kali configuration for unattended installations with some extra tools for day to day use. [Info.](https://github.com/J0nan/RandomThings/tree/main/provisioning/kali/generic) \ No newline at end of file +Kali configuration for unattended installations with some extra tools for day to day use. [Info.](./provisioning/kali/generic) \ No newline at end of file diff --git a/docker-compose files/JDownloader2/README.md b/docker-compose files/JDownloader2/README.md new file mode 100644 index 0000000..01b023b --- /dev/null +++ b/docker-compose files/JDownloader2/README.md @@ -0,0 +1,19 @@ +# JDownloader 2 + VPN docker compose + +This docker compose implements [docker-jdownloader-2](https://github.com/jlesage/docker-jdownloader-2) with [gluetun](https://github.com/qdm12/gluetun). It aims to use JDownloader 2 with a VPN using OpenVPN. + +## Usage + +Modify every line of the [docker-compose.yml](./docker-compose.yml) file that has `# CHANGE ME` with the corresponding values. + +As a summary and checklist the following fields highlighted must be changed: + +- [ ] VPN_SERVICE_PROVIDER=`PROVIDER` +- [ ] OPENVPN_USER=`OPENVPN USER` +- [ ] OPENVPN_PASSWORD=`OPENVPN PASSWORD` +- [ ] SERVER_REGIONS=`SERVER REGION OR LIST OF SERVER REGIONS` +- [ ] VNC_PASSWORD=`password` +- [ ] `/mnt/JDOWNLOADER2_DIR`:/config +- [ ] `/mnt/MEDIA_DIR`:/output + +For information regarding specific VPN providers go to the gluetun wiki: \ No newline at end of file diff --git a/docker-compose files/JDownloader2/docker-compose.yml b/docker-compose files/JDownloader2/docker-compose.yml new file mode 100644 index 0000000..e1e004e --- /dev/null +++ b/docker-compose files/JDownloader2/docker-compose.yml @@ -0,0 +1,52 @@ +services: + gluetun: + image: qmcgaw/gluetun:latest + cap_add: + - NET_ADMIN + environment: + # Documentation for different providers + # https://github.com/qdm12/gluetun-wiki/tree/main/setup/providers + - VPN_SERVICE_PROVIDER=PROVIDER # CHANGE ME + - VPN_TYPE=openvpn + - OPENVPN_USER=OPENVPN USER # CHANGE ME + - OPENVPN_PASSWORD=OPENVPN PASSWORD # CHANGE ME + # Execute the following command to get the list of servers, remember to change the provider + # docker run --rm qmcgaw/gluetun format-servers -yourprovider + - SERVER_REGIONS=SERVER REGION OR LIST OF SERVER REGIONS # CHANGE ME + # volumes: + # - /docker/appdata/gluetun:/config + ports: + - 10054:10054 # jdownloader2 WEB + # - 10056:10056 # jdownloader2 VNC, if needed put the port in the jdownloader2 service + deploy: + resources: + limits: + cpus: "2" + memory: "2g" + + jdownloader2: + image: jlesage/jdownloader-2:latest + container_name: jdownloader2 + network_mode: service:gluetun # This is what makes the app to connect to the VPN. + # Note that all ports were moved to the gluetun app. + environment: + - PUID=568 + - PGID=568 + - TZ=Europe/Berlin + - KEEP_APP_RUNNING=1 + - DARK_MODE=1 + - WEB_LISTENING_PORT=10054 + - VNC_LISTENING_PORT=-1 # Disable, if needed put the port wanted, and change in the gluetun service + - VNC_PASSWORD=password # CHANGE ME + volumes: + - /mnt/JDOWNLOADER2_DIR:/config # Directory you want to save your JDownloader2 config files # CHANGE ME + - /mnt/MEDIA_DIR:/output # Directory of the downloads # CHANGE ME + deploy: + resources: + limits: + cpus: "4" + memory: "4g" + restart: unless-stopped + depends_on: + gluetun: + condition: service_healthy \ No newline at end of file diff --git a/docker-compose files/qBittorrent/README.md b/docker-compose files/qBittorrent/README.md new file mode 100644 index 0000000..62af680 --- /dev/null +++ b/docker-compose files/qBittorrent/README.md @@ -0,0 +1,18 @@ +# qBittorrent + VPN docker compose + +This docker compose implements [docker-qbittorrent](https://github.com/linuxserver/docker-qbittorrent) with [gluetun](https://github.com/qdm12/gluetun). It aims to use qBittorent with a VPN using OpenVPN. + +## Usage + +Modify every line of the [docker-compose.yml](./docker-compose.yml) file that has `# CHANGE ME` with the corresponding values. + +As a summary and checklist the following fields highlighted must be changed: + +- [ ] VPN_SERVICE_PROVIDER=`PROVIDER` +- [ ] OPENVPN_USER=`OPENVPN USER` +- [ ] OPENVPN_PASSWORD=`OPENVPN PASSWORD` +- [ ] SERVER_REGIONS=`SERVER REGION OR LIST OF SERVER REGIONS` +- [ ] `/mnt/QBITTORRENT_DIR`:/config +- [ ] `/mnt/MEDIA_DIR`:/download + +For information regarding specific VPN providers go to the gluetun wiki: \ No newline at end of file diff --git a/docker files/qBittorrent/docker-compose.yml b/docker-compose files/qBittorrent/docker-compose.yml similarity index 100% rename from docker files/qBittorrent/docker-compose.yml rename to docker-compose files/qBittorrent/docker-compose.yml From 858f26ece8673c47dcdc7c247ef9b7ed3f648ac0 Mon Sep 17 00:00:00 2001 From: J0nan Date: Wed, 1 Jan 2025 19:05:14 +0100 Subject: [PATCH 03/22] Renamed title --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b105ee4..7491363 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # RandomThings -- [Docker files](#docker-files) +- [Docker compose files](#docker-compose-files) - [JDownloader 2](#jdownloader-2) - [qBittorrent](#qbittorrent) - [Provisioning](#provisioning) - [Kali Linux](#kali-linux) - [Generic](#generic) -## Docker files +## Docker compose files ### JDownloader 2 From 705a3ee69731bf286ff3733eb675dacc751284ae Mon Sep 17 00:00:00 2001 From: J0nan Date: Wed, 1 Jan 2025 19:19:36 +0100 Subject: [PATCH 04/22] Fixed environment names --- docker-compose files/JDownloader2/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose files/JDownloader2/docker-compose.yml b/docker-compose files/JDownloader2/docker-compose.yml index e1e004e..e1da007 100644 --- a/docker-compose files/JDownloader2/docker-compose.yml +++ b/docker-compose files/JDownloader2/docker-compose.yml @@ -30,8 +30,8 @@ services: network_mode: service:gluetun # This is what makes the app to connect to the VPN. # Note that all ports were moved to the gluetun app. environment: - - PUID=568 - - PGID=568 + - USER_ID=568 + - GROUP_ID=568 - TZ=Europe/Berlin - KEEP_APP_RUNNING=1 - DARK_MODE=1 From 703866f958d3d13086a3b7c517c22388daa02511 Mon Sep 17 00:00:00 2001 From: J0nan Date: Wed, 1 Jan 2025 21:53:19 +0100 Subject: [PATCH 05/22] Added HandBreak --- .gitignore | 1 + README.md | 5 ++++ docker-compose files/HandBreak/README.md | 14 ++++++++++ .../HandBreak/docker-compose.yml | 27 +++++++++++++++++++ 4 files changed, 47 insertions(+) create mode 100644 docker-compose files/HandBreak/README.md create mode 100644 docker-compose files/HandBreak/docker-compose.yml diff --git a/.gitignore b/.gitignore index 1539f4a..101a21e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ docker-compose files/JDownloader2/docker-compose_good.yml docker-compose files/qBittorrent/docker-compose_good.yml +docker-compose files/HandBreak/docker-compose_good.yml diff --git a/README.md b/README.md index 7491363..e1c7eea 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # RandomThings - [Docker compose files](#docker-compose-files) + - [HandBreak](#handbreak) - [JDownloader 2](#jdownloader-2) - [qBittorrent](#qbittorrent) - [Provisioning](#provisioning) @@ -9,6 +10,10 @@ ## Docker compose files +### HandBreak + +Docker compose that implements HandBreak. [Info.](./docker-compose%20files/HandBreak/) + ### JDownloader 2 Docker compose that implements JDownloader 2 docker with VPN. [Info.](./docker-compose%20files/JDownloader2/) diff --git a/docker-compose files/HandBreak/README.md b/docker-compose files/HandBreak/README.md new file mode 100644 index 0000000..42be568 --- /dev/null +++ b/docker-compose files/HandBreak/README.md @@ -0,0 +1,14 @@ +# HandBreak docker compose + +This docker compose implements [docker-handbrake](https://github.com/jlesage/docker-handbrake). + +## Usage + +Modify every line of the [docker-compose.yml](./docker-compose.yml) file that has `# CHANGE ME` with the corresponding values. + +As a summary and checklist the following fields highlighted must be changed: + +- [ ] VNC_PASSWORD=`password` +- [ ] `/mnt/HANDBREAK_DIR`:/config +- [ ] `/mnt/MEDIA_DIR`:/storage:ro +- [ ] `/mnt/HANDBREAK_OUT`:/output diff --git a/docker-compose files/HandBreak/docker-compose.yml b/docker-compose files/HandBreak/docker-compose.yml new file mode 100644 index 0000000..07864eb --- /dev/null +++ b/docker-compose files/HandBreak/docker-compose.yml @@ -0,0 +1,27 @@ +services: + handbreak: + image: jlesage/handbrake:latest + container_name: handbreak + environment: + - USER_ID=568 + - GROUP_ID=568 + - TZ=Europe/Berlin + - KEEP_APP_RUNNING=1 + - DARK_MODE=1 + - WEB_LISTENING_PORT=10053 + - VNC_LISTENING_PORT=-1 # Disable, if needed put the port wanted, and change in the ports section + - VNC_PASSWORD=password # CHANGE ME + - AUTOMATED_CONVERSION=0 + ports: + - 10053:10053 # handbreak WEB + # - 10056:10056 # handbreak VNC + volumes: + - /mnt/HANDBREAK_DIR:/config # This is where the application stores its configuration, states, log and any files needing persistency. # CHANGE ME + - /mnt/MEDIA_DIR:/storage:ro # This location contains files from your host that need to be accessible to the application. # CHANGE ME + - /mnt/HANDBREAK_OUT:/output # This is where automatically converted video files are written. # CHANGE ME + deploy: + resources: + limits: + cpus: "24" + memory: "8g" + restart: unless-stopped \ No newline at end of file From 6857b219174e813292ad818ddf27df5d847443c4 Mon Sep 17 00:00:00 2001 From: J0nan Date: Wed, 1 Jan 2025 21:54:12 +0100 Subject: [PATCH 06/22] Added new line --- docker-compose files/qBittorrent/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose files/qBittorrent/README.md b/docker-compose files/qBittorrent/README.md index 62af680..cdff73f 100644 --- a/docker-compose files/qBittorrent/README.md +++ b/docker-compose files/qBittorrent/README.md @@ -15,4 +15,4 @@ As a summary and checklist the following fields highlighted must be changed: - [ ] `/mnt/QBITTORRENT_DIR`:/config - [ ] `/mnt/MEDIA_DIR`:/download -For information regarding specific VPN providers go to the gluetun wiki: \ No newline at end of file +For information regarding specific VPN providers go to the gluetun wiki: From b2ad087793bcf3e969eadd858d78c108ac69be63 Mon Sep 17 00:00:00 2001 From: J0nan Date: Fri, 3 Jan 2025 23:52:44 +0100 Subject: [PATCH 07/22] Added MKVToolNix --- .gitignore | 1 + README.md | 5 ++++ docker-compose files/MKVToolNix/README.md | 13 ++++++++++ .../MKVToolNix/docker-compose.yml | 26 +++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 docker-compose files/MKVToolNix/README.md create mode 100644 docker-compose files/MKVToolNix/docker-compose.yml diff --git a/.gitignore b/.gitignore index 101a21e..c957ec3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ docker-compose files/JDownloader2/docker-compose_good.yml docker-compose files/qBittorrent/docker-compose_good.yml docker-compose files/HandBreak/docker-compose_good.yml +docker-compose files/MKVToolNix/docker-compose_good.yml diff --git a/README.md b/README.md index e1c7eea..ffc8121 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ - [Docker compose files](#docker-compose-files) - [HandBreak](#handbreak) - [JDownloader 2](#jdownloader-2) + - [MKVToolNix](#mkvtoolnix) - [qBittorrent](#qbittorrent) - [Provisioning](#provisioning) - [Kali Linux](#kali-linux) @@ -18,6 +19,10 @@ Docker compose that implements HandBreak. [Info.](./docker-compose%20files/HandB Docker compose that implements JDownloader 2 docker with VPN. [Info.](./docker-compose%20files/JDownloader2/) +### MKVToolNix + +Docker compose that implements MKVToolNix. [Info.](./docker-compose%20files/MKVToolNix/) + ### qBittorrent Docker compose that implements qBittorrent docker with VPN. [Info.](./docker-compose%20files/qBittorrent) diff --git a/docker-compose files/MKVToolNix/README.md b/docker-compose files/MKVToolNix/README.md new file mode 100644 index 0000000..c6758eb --- /dev/null +++ b/docker-compose files/MKVToolNix/README.md @@ -0,0 +1,13 @@ +# MKVToolNix docker compose + +This docker compose implements [docker-mkvtoolnix](https://github.com/jlesage/docker-mkvtoolnix). + +## Usage + +Modify every line of the [docker-compose.yml](./docker-compose.yml) file that has `# CHANGE ME` with the corresponding values. + +As a summary and checklist the following fields highlighted must be changed: + +- [ ] VNC_PASSWORD=`password` +- [ ] `/mnt/MKVTOOLNIX_DIR`:/config +- [ ] `/mnt/MKVTOOLNIX_OUT`:/output diff --git a/docker-compose files/MKVToolNix/docker-compose.yml b/docker-compose files/MKVToolNix/docker-compose.yml new file mode 100644 index 0000000..93da742 --- /dev/null +++ b/docker-compose files/MKVToolNix/docker-compose.yml @@ -0,0 +1,26 @@ +services: + mkvtoolnix: + image: jlesage/mkvtoolnix:latest + container_name: mkvtoolnix + environment: + - USER_ID=568 + - GROUP_ID=568 + - TZ=Europe/Berlin + - KEEP_APP_RUNNING=1 + - DARK_MODE=1 + - WEB_LISTENING_PORT=10236 + - VNC_LISTENING_PORT=-1 # Disable, if needed put the port wanted, and change in the ports section + - VNC_PASSWORD=password # CHANGE ME + - AUTOMATED_CONVERSION=0 + ports: + - 10236:10236 # mkvtoolnix WEB + # - 5800:5800 # mkvtoolnix VNC + volumes: + - /mnt/MKVTOOLNIX_DIR:/config # This is where the application stores its configuration, states, log and any files needing persistency. # CHANGE ME + - /mnt/MKVTOOLNIX_OUT:/output # This is where automatically converted video files are written. # CHANGE ME + deploy: + resources: + limits: + cpus: "4" + memory: "4g" + restart: unless-stopped \ No newline at end of file From 22113dee6c40090e49a4ecee9f3af5f720ecdd81 Mon Sep 17 00:00:00 2001 From: J0nan Date: Sat, 4 Jan 2025 00:09:43 +0100 Subject: [PATCH 08/22] Added TriliumNext Notes --- .gitignore | 1 + README.md | 7 ++++++- .../TriliumNext Notes/README.md | 11 +++++++++++ .../TriliumNext Notes/docker-compose.yml | 18 ++++++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 docker-compose files/TriliumNext Notes/README.md create mode 100644 docker-compose files/TriliumNext Notes/docker-compose.yml diff --git a/.gitignore b/.gitignore index c957ec3..32cc939 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ docker-compose files/JDownloader2/docker-compose_good.yml docker-compose files/qBittorrent/docker-compose_good.yml docker-compose files/HandBreak/docker-compose_good.yml docker-compose files/MKVToolNix/docker-compose_good.yml +docker-compose files/TriliumNext Notes/docker-compose_good.yml diff --git a/README.md b/README.md index ffc8121..9c1e711 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ - [JDownloader 2](#jdownloader-2) - [MKVToolNix](#mkvtoolnix) - [qBittorrent](#qbittorrent) + - [TriliumNext Notes](#triliumnext-notes) - [Provisioning](#provisioning) - [Kali Linux](#kali-linux) - [Generic](#generic) @@ -27,10 +28,14 @@ Docker compose that implements MKVToolNix. [Info.](./docker-compose%20files/MKVT Docker compose that implements qBittorrent docker with VPN. [Info.](./docker-compose%20files/qBittorrent) +### TriliumNext Notes + +Docker compose that implements TriliumNext Notes. [Info.](./docker-compose%20files/TriliumNext%20Notes/) + ## Provisioning ### Kali Linux #### Generic -Kali configuration for unattended installations with some extra tools for day to day use. [Info.](./provisioning/kali/generic) \ No newline at end of file +Kali configuration for unattended installations with some extra tools for day to day use. [Info.](./provisioning/kali/generic) diff --git a/docker-compose files/TriliumNext Notes/README.md b/docker-compose files/TriliumNext Notes/README.md new file mode 100644 index 0000000..e63f577 --- /dev/null +++ b/docker-compose files/TriliumNext Notes/README.md @@ -0,0 +1,11 @@ +# TriliumNext Notes docker compose + +This docker compose implements [TriliumNext Notes](https://github.com/TriliumNext/Notes). + +## Usage + +Modify every line of the [docker-compose.yml](./docker-compose.yml) file that has `# CHANGE ME` with the corresponding values. + +As a summary and checklist the following fields highlighted must be changed: + +- [ ] `/mnt/TRILIUMNEXT_DIR`:/home/node/trilium-data diff --git a/docker-compose files/TriliumNext Notes/docker-compose.yml b/docker-compose files/TriliumNext Notes/docker-compose.yml new file mode 100644 index 0000000..ad8e8b4 --- /dev/null +++ b/docker-compose files/TriliumNext Notes/docker-compose.yml @@ -0,0 +1,18 @@ +services: + triliumnext: + image: triliumnext/notes:latest + container_name: triliumnext + environment: + - USER_ID=568 + - GROUP_ID=568 + - TZ=Europe/Berlin + ports: + - 10156:8080 # triliumnext + volumes: + - /mnt/TRILIUMNEXT_DIR:/home/node/trilium-data # CHANGE ME + deploy: + resources: + limits: + cpus: "4" + memory: "4g" + restart: unless-stopped \ No newline at end of file From faad872c1d86ff38710fdf228b28cbbcc1a483e4 Mon Sep 17 00:00:00 2001 From: J0nan Date: Sat, 4 Jan 2025 00:41:43 +0100 Subject: [PATCH 09/22] Added DeezSpot_bot_docker --- .gitignore | 1 + README.md | 5 ++++ .../DeezSpot_bot_docker/README.md | 23 +++++++++++++++++ .../DeezSpot_bot_docker/docker-compose.yml | 25 +++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 docker-compose files/DeezSpot_bot_docker/README.md create mode 100644 docker-compose files/DeezSpot_bot_docker/docker-compose.yml diff --git a/.gitignore b/.gitignore index 32cc939..f7c49b2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ docker-compose files/qBittorrent/docker-compose_good.yml docker-compose files/HandBreak/docker-compose_good.yml docker-compose files/MKVToolNix/docker-compose_good.yml docker-compose files/TriliumNext Notes/docker-compose_good.yml +docker-compose files/DeezSpot_bot_docker/docker-compose_good.yml diff --git a/README.md b/README.md index 9c1e711..1a7440e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # RandomThings - [Docker compose files](#docker-compose-files) + - [DeezSpot\_bot\_docker](#deezspot_bot_docker) - [HandBreak](#handbreak) - [JDownloader 2](#jdownloader-2) - [MKVToolNix](#mkvtoolnix) @@ -12,6 +13,10 @@ ## Docker compose files +### DeezSpot_bot_docker + +Docker compose that implements DeezSpot_bot_docker. [Info.](./docker-compose%20files/DeezSpot_bot_docker/) + ### HandBreak Docker compose that implements HandBreak. [Info.](./docker-compose%20files/HandBreak/) diff --git a/docker-compose files/DeezSpot_bot_docker/README.md b/docker-compose files/DeezSpot_bot_docker/README.md new file mode 100644 index 0000000..9fecc14 --- /dev/null +++ b/docker-compose files/DeezSpot_bot_docker/README.md @@ -0,0 +1,23 @@ +# DeezSpot_bot_docker docker compose + +This docker compose implements [DeezSpot_bot_docker](https://github.com/J0nan/DeezSpot_bot_docker). + +## Usage + +Modify every line of the [docker-compose.yml](./docker-compose.yml) file that has `# CHANGE ME` with the corresponding values. + +As a summary and checklist the following fields highlighted must be changed: + +- [] USER_ERRORS: `CHAT_ID_ERRORS` +- [] BUNKER_CHANNEL: `BUNKER_CHANNEL_ID` +- [] OWL_CHANNEL: `OWL_CHANNEL_ID` +- [] ROOT_ID: `ROOT_USER_ID` +- [] BOT_NAME: "`"BOT_NAME`" +- [] ARL_TOKEN: `DEEZER_ARL_TOKEN` +- [] EMAIL_DEE: `DEEZER_EMAIL` +- [] PWD_DEE: `DEEZER_PASSWORD` +- [] BOT_TOKEN: `TELEGRAM_BOT_TOKEN` +- [] API_ID: `TELEGRAM_API_ID` +- [] API_HASH: `TELEGRAM_API_HASH` + +For information regarding how to get some tokens, credentials or options check the repository: diff --git a/docker-compose files/DeezSpot_bot_docker/docker-compose.yml b/docker-compose files/DeezSpot_bot_docker/docker-compose.yml new file mode 100644 index 0000000..b478963 --- /dev/null +++ b/docker-compose files/DeezSpot_bot_docker/docker-compose.yml @@ -0,0 +1,25 @@ +services: + deezspot_bot: + image: j0n4n/deezspot_bot_docker:latest + container_name: deezspot_bot + environment: + - USER_ERRORS: CHAT_ID_ERRORS # Chat id where to send users errors. # CHANGE ME + - BUNKER_CHANNEL: BUNKER_CHANNEL_ID # Chat id to use as an archive # CHANGE ME + - OWL_CHANNEL: OWL_CHANNEL_ID # Chat id where to listen for announcements to the users # CHANGE ME + - ROOT_ID: ROOT_USER_ID # User id to have admin access # CHANGE ME + - BOT_NAME: "BOT_NAME" # Username with the @ of the bot. # CHANGE ME + - ARL_TOKEN: DEEZER_ARL_TOKEN # Deezer ARL token # CHANGE ME + - EMAIL_DEE: DEEZER_EMAIL # Email to log in on Deezer # CHANGE ME + - PWD_DEE: DEEZER_PASSWORD # Password to log in on Deezer # CHANGE ME + - BOT_TOKEN: TELEGRAM_BOT_TOKEN # Telegram bot token # CHANGE ME + - API_ID: TELEGRAM_API_ID # Telegram api id # CHANGE ME + - API_HASH: TELEGRAM_API_HASH # Telegram api hash # CHANGE ME + volumes: + - ./DB:/app/DB + - ./credentials:/app/credentials + deploy: + resources: + limits: + cpus: "4" + memory: "2g" + restart: unless-stopped \ No newline at end of file From 170fab074b026de7c0ad7e04eed537c315e406ac Mon Sep 17 00:00:00 2001 From: J0nan Date: Sat, 4 Jan 2025 00:45:00 +0100 Subject: [PATCH 10/22] Fixed path environments and readme --- .../DeezSpot_bot_docker/README.md | 24 ++++++++++--------- .../DeezSpot_bot_docker/docker-compose.yml | 4 ++-- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/docker-compose files/DeezSpot_bot_docker/README.md b/docker-compose files/DeezSpot_bot_docker/README.md index 9fecc14..ee29cf0 100644 --- a/docker-compose files/DeezSpot_bot_docker/README.md +++ b/docker-compose files/DeezSpot_bot_docker/README.md @@ -8,16 +8,18 @@ Modify every line of the [docker-compose.yml](./docker-compose.yml) file that ha As a summary and checklist the following fields highlighted must be changed: -- [] USER_ERRORS: `CHAT_ID_ERRORS` -- [] BUNKER_CHANNEL: `BUNKER_CHANNEL_ID` -- [] OWL_CHANNEL: `OWL_CHANNEL_ID` -- [] ROOT_ID: `ROOT_USER_ID` -- [] BOT_NAME: "`"BOT_NAME`" -- [] ARL_TOKEN: `DEEZER_ARL_TOKEN` -- [] EMAIL_DEE: `DEEZER_EMAIL` -- [] PWD_DEE: `DEEZER_PASSWORD` -- [] BOT_TOKEN: `TELEGRAM_BOT_TOKEN` -- [] API_ID: `TELEGRAM_API_ID` -- [] API_HASH: `TELEGRAM_API_HASH` +- [ ] USER_ERRORS: `CHAT_ID_ERRORS` +- [ ] BUNKER_CHANNEL: `BUNKER_CHANNEL_ID` +- [ ] OWL_CHANNEL: `OWL_CHANNEL_ID` +- [ ] ROOT_ID: `ROOT_USER_ID` +- [ ] BOT_NAME: "`"BOT_NAME`" +- [ ] ARL_TOKEN: `DEEZER_ARL_TOKEN` +- [ ] EMAIL_DEE: `DEEZER_EMAIL` +- [ ] PWD_DEE: `DEEZER_PASSWORD` +- [ ] BOT_TOKEN: `TELEGRAM_BOT_TOKEN` +- [ ] API_ID: `TELEGRAM_API_ID` +- [ ] API_HASH: `TELEGRAM_API_HASH` +- [ ] /mnt/`DB_DIR`:/app/DB +- [ ] /mnt/`CREDENTIALS_DIR`:/app/credentials For information regarding how to get some tokens, credentials or options check the repository: diff --git a/docker-compose files/DeezSpot_bot_docker/docker-compose.yml b/docker-compose files/DeezSpot_bot_docker/docker-compose.yml index b478963..28e05a3 100644 --- a/docker-compose files/DeezSpot_bot_docker/docker-compose.yml +++ b/docker-compose files/DeezSpot_bot_docker/docker-compose.yml @@ -15,8 +15,8 @@ services: - API_ID: TELEGRAM_API_ID # Telegram api id # CHANGE ME - API_HASH: TELEGRAM_API_HASH # Telegram api hash # CHANGE ME volumes: - - ./DB:/app/DB - - ./credentials:/app/credentials + - /mnt/DB_DIR:/app/DB # CHANGE ME + - /mnt/CREDENTIALS_DIR:/app/credentials # CHANGE ME deploy: resources: limits: From 035aec7705fe5620d4d574af60168d860d7c77ad Mon Sep 17 00:00:00 2001 From: J0nan Date: Sat, 4 Jan 2025 00:56:29 +0100 Subject: [PATCH 11/22] Changed : to = --- .../DeezSpot_bot_docker/README.md | 22 +++++++++---------- .../DeezSpot_bot_docker/docker-compose.yml | 22 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/docker-compose files/DeezSpot_bot_docker/README.md b/docker-compose files/DeezSpot_bot_docker/README.md index ee29cf0..29c1628 100644 --- a/docker-compose files/DeezSpot_bot_docker/README.md +++ b/docker-compose files/DeezSpot_bot_docker/README.md @@ -8,17 +8,17 @@ Modify every line of the [docker-compose.yml](./docker-compose.yml) file that ha As a summary and checklist the following fields highlighted must be changed: -- [ ] USER_ERRORS: `CHAT_ID_ERRORS` -- [ ] BUNKER_CHANNEL: `BUNKER_CHANNEL_ID` -- [ ] OWL_CHANNEL: `OWL_CHANNEL_ID` -- [ ] ROOT_ID: `ROOT_USER_ID` -- [ ] BOT_NAME: "`"BOT_NAME`" -- [ ] ARL_TOKEN: `DEEZER_ARL_TOKEN` -- [ ] EMAIL_DEE: `DEEZER_EMAIL` -- [ ] PWD_DEE: `DEEZER_PASSWORD` -- [ ] BOT_TOKEN: `TELEGRAM_BOT_TOKEN` -- [ ] API_ID: `TELEGRAM_API_ID` -- [ ] API_HASH: `TELEGRAM_API_HASH` +- [ ] USER_ERRORS=`CHAT_ID_ERRORS` +- [ ] BUNKER_CHANNEL=`BUNKER_CHANNEL_ID` +- [ ] OWL_CHANNEL=`OWL_CHANNEL_ID` +- [ ] ROOT_ID=`ROOT_USER_ID` +- [ ] BOT_NAME="`"BOT_NAME`" +- [ ] ARL_TOKEN=`DEEZER_ARL_TOKEN` +- [ ] EMAIL_DEE=`DEEZER_EMAIL` +- [ ] PWD_DEE=`DEEZER_PASSWORD` +- [ ] BOT_TOKEN=`TELEGRAM_BOT_TOKEN` +- [ ] API_ID=`TELEGRAM_API_ID` +- [ ] API_HASH=`TELEGRAM_API_HASH` - [ ] /mnt/`DB_DIR`:/app/DB - [ ] /mnt/`CREDENTIALS_DIR`:/app/credentials diff --git a/docker-compose files/DeezSpot_bot_docker/docker-compose.yml b/docker-compose files/DeezSpot_bot_docker/docker-compose.yml index 28e05a3..53b17c4 100644 --- a/docker-compose files/DeezSpot_bot_docker/docker-compose.yml +++ b/docker-compose files/DeezSpot_bot_docker/docker-compose.yml @@ -3,17 +3,17 @@ services: image: j0n4n/deezspot_bot_docker:latest container_name: deezspot_bot environment: - - USER_ERRORS: CHAT_ID_ERRORS # Chat id where to send users errors. # CHANGE ME - - BUNKER_CHANNEL: BUNKER_CHANNEL_ID # Chat id to use as an archive # CHANGE ME - - OWL_CHANNEL: OWL_CHANNEL_ID # Chat id where to listen for announcements to the users # CHANGE ME - - ROOT_ID: ROOT_USER_ID # User id to have admin access # CHANGE ME - - BOT_NAME: "BOT_NAME" # Username with the @ of the bot. # CHANGE ME - - ARL_TOKEN: DEEZER_ARL_TOKEN # Deezer ARL token # CHANGE ME - - EMAIL_DEE: DEEZER_EMAIL # Email to log in on Deezer # CHANGE ME - - PWD_DEE: DEEZER_PASSWORD # Password to log in on Deezer # CHANGE ME - - BOT_TOKEN: TELEGRAM_BOT_TOKEN # Telegram bot token # CHANGE ME - - API_ID: TELEGRAM_API_ID # Telegram api id # CHANGE ME - - API_HASH: TELEGRAM_API_HASH # Telegram api hash # CHANGE ME + - USER_ERRORS=CHAT_ID_ERRORS # Chat id where to send users errors. # CHANGE ME + - BUNKER_CHANNEL=BUNKER_CHANNEL_ID # Chat id to use as an archive # CHANGE ME + - OWL_CHANNEL=OWL_CHANNEL_ID # Chat id where to listen for announcements to the users # CHANGE ME + - ROOT_ID=ROOT_USER_ID # User id to have admin access # CHANGE ME + - BOT_NAME="BOT_NAME" # Username with the @ of the bot. # CHANGE ME + - ARL_TOKEN=DEEZER_ARL_TOKEN # Deezer ARL token # CHANGE ME + - EMAIL_DEE=DEEZER_EMAIL # Email to log in on Deezer # CHANGE ME + - PWD_DEE=DEEZER_PASSWORD # Password to log in on Deezer # CHANGE ME + - BOT_TOKEN=TELEGRAM_BOT_TOKEN # Telegram bot token # CHANGE ME + - API_ID=TELEGRAM_API_ID # Telegram api id # CHANGE ME + - API_HASH=TELEGRAM_API_HASH # Telegram api hash # CHANGE ME volumes: - /mnt/DB_DIR:/app/DB # CHANGE ME - /mnt/CREDENTIALS_DIR:/app/credentials # CHANGE ME From 4e3ad5e8c39b2f051614f7992291712e61ac94e0 Mon Sep 17 00:00:00 2001 From: J0nan Date: Sat, 4 Jan 2025 01:00:08 +0100 Subject: [PATCH 12/22] Added time Zone --- docker-compose files/DeezSpot_bot_docker/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose files/DeezSpot_bot_docker/docker-compose.yml b/docker-compose files/DeezSpot_bot_docker/docker-compose.yml index 53b17c4..09a1483 100644 --- a/docker-compose files/DeezSpot_bot_docker/docker-compose.yml +++ b/docker-compose files/DeezSpot_bot_docker/docker-compose.yml @@ -14,6 +14,7 @@ services: - BOT_TOKEN=TELEGRAM_BOT_TOKEN # Telegram bot token # CHANGE ME - API_ID=TELEGRAM_API_ID # Telegram api id # CHANGE ME - API_HASH=TELEGRAM_API_HASH # Telegram api hash # CHANGE ME + - TZ=Europe/Berlin volumes: - /mnt/DB_DIR:/app/DB # CHANGE ME - /mnt/CREDENTIALS_DIR:/app/credentials # CHANGE ME From d9bec619f38ff3d5b302e898af879d96a0b7725e Mon Sep 17 00:00:00 2001 From: J0nan Date: Sat, 4 Jan 2025 01:08:28 +0100 Subject: [PATCH 13/22] Added Telethon Downloader --- .gitignore | 1 + README.md | 5 +++++ .../Telethon Downloader/README.md | 18 ++++++++++++++++ .../Telethon Downloader/docker-compose.yml | 21 +++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 docker-compose files/Telethon Downloader/README.md create mode 100644 docker-compose files/Telethon Downloader/docker-compose.yml diff --git a/.gitignore b/.gitignore index f7c49b2..6c85b9f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ docker-compose files/HandBreak/docker-compose_good.yml docker-compose files/MKVToolNix/docker-compose_good.yml docker-compose files/TriliumNext Notes/docker-compose_good.yml docker-compose files/DeezSpot_bot_docker/docker-compose_good.yml +docker-compose files/Telethon Downloader/docker-compose_good.yml diff --git a/README.md b/README.md index 1a7440e..f8829c0 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ - [JDownloader 2](#jdownloader-2) - [MKVToolNix](#mkvtoolnix) - [qBittorrent](#qbittorrent) + - [Telethon Downloader](#telethon-downloader) - [TriliumNext Notes](#triliumnext-notes) - [Provisioning](#provisioning) - [Kali Linux](#kali-linux) @@ -33,6 +34,10 @@ Docker compose that implements MKVToolNix. [Info.](./docker-compose%20files/MKVT Docker compose that implements qBittorrent docker with VPN. [Info.](./docker-compose%20files/qBittorrent) +### Telethon Downloader + +Docker compose that implements Telethon Downloader. [Info.](./docker-compose%20files/Telethon%20Downloader/) + ### TriliumNext Notes Docker compose that implements TriliumNext Notes. [Info.](./docker-compose%20files/TriliumNext%20Notes/) diff --git a/docker-compose files/Telethon Downloader/README.md b/docker-compose files/Telethon Downloader/README.md new file mode 100644 index 0000000..3130de7 --- /dev/null +++ b/docker-compose files/Telethon Downloader/README.md @@ -0,0 +1,18 @@ +# Telethon Downloader docker compose + +This docker compose implements [Telethon Downloader](https://github.com/jsavargas/telethon_downloader). + +## Usage + +Modify every line of the [docker-compose.yml](./docker-compose.yml) file that has `# CHANGE ME` with the corresponding values. + +As a summary and checklist the following fields highlighted must be changed: + +- [ ] TG_AUTHORIZED_USER_ID:`USER_CHAT_ID` +- [ ] TG_API_ID:`TELEGRAM_API_ID` +- [ ] TG_API_HASH:`TELEGRAM_API_HASH` +- [ ] TG_BOT_TOKEN:`TELEGRAM_BOT_TOKEN` +- [ ] /mnt/`TELETHON_CONFIG`:/config +- [ ] /mnt/`TELETHON_DOWNLOAD`:/download + +For information regarding how to get some tokens, credentials or options check the repository: diff --git a/docker-compose files/Telethon Downloader/docker-compose.yml b/docker-compose files/Telethon Downloader/docker-compose.yml new file mode 100644 index 0000000..de7a7ef --- /dev/null +++ b/docker-compose files/Telethon Downloader/docker-compose.yml @@ -0,0 +1,21 @@ +services: + telethon_downloader: + image: jsavargas/telethon_downloader:latest + container_name: telethon_downloader + environment: + - PUID:586 + - PGID:586 + - TG_AUTHORIZED_USER_ID:USER_CHAT_ID # telegram chat_id authorized # CHANGE ME + - TG_API_ID:TELEGRAM_API_ID # telegram API key generated at ´Generating Telegram API keys´ # CHANGE ME + - TG_API_HASH:TELEGRAM_API_HASH # telegram API hash generated at ´Generating Telegram API keys´ # CHANGE ME + - TG_BOT_TOKEN:TELEGRAM_BOT_TOKEN # telegram BOT token generated at ´Creating a Telegram Bot´ # CHANGE ME + - TZ=Europe/Berlin + volumes: + - /mnt/TELETHON_CONFIG:/config # Path where configuration files, pending downloads, and recent downloads are stored. # CHANGE ME + - /mnt/TELETHON_DOWNLOAD:/download # Folder where files are downloaded. # CHANGE ME + deploy: + resources: + limits: + cpus: "2" + memory: "2g" + restart: unless-stopped \ No newline at end of file From c31dc894faab33322b9803b33cbe1c2aa8c9ec23 Mon Sep 17 00:00:00 2001 From: J0nan Date: Sat, 4 Jan 2025 05:21:20 +0100 Subject: [PATCH 14/22] Fixes --- docker-compose files/Telethon Downloader/README.md | 8 ++++---- .../Telethon Downloader/docker-compose.yml | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker-compose files/Telethon Downloader/README.md b/docker-compose files/Telethon Downloader/README.md index 3130de7..f5af0d5 100644 --- a/docker-compose files/Telethon Downloader/README.md +++ b/docker-compose files/Telethon Downloader/README.md @@ -8,10 +8,10 @@ Modify every line of the [docker-compose.yml](./docker-compose.yml) file that ha As a summary and checklist the following fields highlighted must be changed: -- [ ] TG_AUTHORIZED_USER_ID:`USER_CHAT_ID` -- [ ] TG_API_ID:`TELEGRAM_API_ID` -- [ ] TG_API_HASH:`TELEGRAM_API_HASH` -- [ ] TG_BOT_TOKEN:`TELEGRAM_BOT_TOKEN` +- [ ] TG_AUTHORIZED_USER_ID=`USER_CHAT_ID` +- [ ] TG_API_ID=`TELEGRAM_API_ID` +- [ ] TG_API_HASH=`TELEGRAM_API_HASH` +- [ ] TG_BOT_TOKEN=`TELEGRAM_BOT_TOKEN` - [ ] /mnt/`TELETHON_CONFIG`:/config - [ ] /mnt/`TELETHON_DOWNLOAD`:/download diff --git a/docker-compose files/Telethon Downloader/docker-compose.yml b/docker-compose files/Telethon Downloader/docker-compose.yml index de7a7ef..1847ebf 100644 --- a/docker-compose files/Telethon Downloader/docker-compose.yml +++ b/docker-compose files/Telethon Downloader/docker-compose.yml @@ -3,12 +3,12 @@ services: image: jsavargas/telethon_downloader:latest container_name: telethon_downloader environment: - - PUID:586 - - PGID:586 - - TG_AUTHORIZED_USER_ID:USER_CHAT_ID # telegram chat_id authorized # CHANGE ME - - TG_API_ID:TELEGRAM_API_ID # telegram API key generated at ´Generating Telegram API keys´ # CHANGE ME - - TG_API_HASH:TELEGRAM_API_HASH # telegram API hash generated at ´Generating Telegram API keys´ # CHANGE ME - - TG_BOT_TOKEN:TELEGRAM_BOT_TOKEN # telegram BOT token generated at ´Creating a Telegram Bot´ # CHANGE ME + - PUID=586 + - PGID=586 + - TG_AUTHORIZED_USER_ID=USER_CHAT_ID # telegram chat_id authorized # CHANGE ME + - TG_API_ID=TELEGRAM_API_ID # telegram API key generated at ´Generating Telegram API keys´ # CHANGE ME + - TG_API_HASH=TELEGRAM_API_HASH # telegram API hash generated at ´Generating Telegram API keys´ # CHANGE ME + - TG_BOT_TOKEN=TELEGRAM_BOT_TOKEN # telegram BOT token generated at ´Creating a Telegram Bot´ # CHANGE ME - TZ=Europe/Berlin volumes: - /mnt/TELETHON_CONFIG:/config # Path where configuration files, pending downloads, and recent downloads are stored. # CHANGE ME From 18b533cf13e58a36719ba409fadaec5763ca43c7 Mon Sep 17 00:00:00 2001 From: J0nan Date: Sat, 8 Mar 2025 00:28:53 +0100 Subject: [PATCH 15/22] Added Stirling-PDF docker and fixed JDownloader2 --- .gitignore | 1 + README.md | 5 +++++ .../JDownloader2/docker-compose.yml | 1 + docker-compose files/Stirling-PDF/README.md | 13 ++++++++++++ .../Stirling-PDF/docker-compose.yml | 21 +++++++++++++++++++ 5 files changed, 41 insertions(+) create mode 100644 docker-compose files/Stirling-PDF/README.md create mode 100644 docker-compose files/Stirling-PDF/docker-compose.yml diff --git a/.gitignore b/.gitignore index 6c85b9f..86bd624 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ docker-compose files/MKVToolNix/docker-compose_good.yml docker-compose files/TriliumNext Notes/docker-compose_good.yml docker-compose files/DeezSpot_bot_docker/docker-compose_good.yml docker-compose files/Telethon Downloader/docker-compose_good.yml +docker-compose files/Stirling-PDF/docker-compose_good.yml diff --git a/README.md b/README.md index f8829c0..589102a 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ - [qBittorrent](#qbittorrent) - [Telethon Downloader](#telethon-downloader) - [TriliumNext Notes](#triliumnext-notes) + - [Stirling-PDF](#stirling-pdf) - [Provisioning](#provisioning) - [Kali Linux](#kali-linux) - [Generic](#generic) @@ -42,6 +43,10 @@ Docker compose that implements Telethon Downloader. [Info.](./docker-compose%20f Docker compose that implements TriliumNext Notes. [Info.](./docker-compose%20files/TriliumNext%20Notes/) +### Stirling-PDF + +Docker compose that implements Stirling-PDF. [Info.](./docker-compose%20files/Stirling-PDF/) + ## Provisioning ### Kali Linux diff --git a/docker-compose files/JDownloader2/docker-compose.yml b/docker-compose files/JDownloader2/docker-compose.yml index e1da007..342c6ab 100644 --- a/docker-compose files/JDownloader2/docker-compose.yml +++ b/docker-compose files/JDownloader2/docker-compose.yml @@ -6,6 +6,7 @@ services: environment: # Documentation for different providers # https://github.com/qdm12/gluetun-wiki/tree/main/setup/providers + - DOT=off - VPN_SERVICE_PROVIDER=PROVIDER # CHANGE ME - VPN_TYPE=openvpn - OPENVPN_USER=OPENVPN USER # CHANGE ME diff --git a/docker-compose files/Stirling-PDF/README.md b/docker-compose files/Stirling-PDF/README.md new file mode 100644 index 0000000..5363fc1 --- /dev/null +++ b/docker-compose files/Stirling-PDF/README.md @@ -0,0 +1,13 @@ +# Stirling-PDF docker compose + +This docker compose implements [Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF). + +## Usage + +Modify every line of the [docker-compose.yml](./docker-compose.yml) file that has `# CHANGE ME` with the corresponding values. + +As a summary and checklist the following fields highlighted must be changed: + +- [ ] `/mnt/STIRLINGPDF_DIR/trainingData`:/usr/share/tessdata/ +- [ ] `/mnt/STIRLINGPDF_DIR/extraConfigs`:/configs/ +- [ ] `/mnt/STIRLINGPDF_DIR/logs`:/logs/ diff --git a/docker-compose files/Stirling-PDF/docker-compose.yml b/docker-compose files/Stirling-PDF/docker-compose.yml new file mode 100644 index 0000000..7351f62 --- /dev/null +++ b/docker-compose files/Stirling-PDF/docker-compose.yml @@ -0,0 +1,21 @@ +services: + stirling-pdf: + image: stirlingtools/stirling-pdf:latest-fat + container_name: stirling-pdf + environment: + - LANGS=es_ES,en_US # CHANGE ME + - DOCKER_ENABLE_SECURITY=true + - SECURITY_ENABLE_LOGIN=true + - APP_LOCALE=es-ES # CHANGE ME + ports: + - '11156:8080' + volumes: + - /mnt/STIRLINGPDF_DIR/trainingData:/usr/share/tessdata # Required for extra OCR languages # CHANGE ME + - /mnt/STIRLINGPDF_DIR/extraConfigs:/configs # CHANGE ME + - /mnt/STIRLINGPDF_DIR/logs:/logs/ # CHANGE ME + deploy: + resources: + limits: + cpus: "4" + memory: "4g" + restart: unless-stopped \ No newline at end of file From 015e2a14edbd80496112f0741b5a77a364f327a4 Mon Sep 17 00:00:00 2001 From: J0nan Date: Sun, 9 Mar 2025 00:22:49 +0100 Subject: [PATCH 16/22] Added Health check to gluetun --- docker-compose files/JDownloader2/docker-compose.yml | 6 ++++++ docker-compose files/qBittorrent/docker-compose.yml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/docker-compose files/JDownloader2/docker-compose.yml b/docker-compose files/JDownloader2/docker-compose.yml index 342c6ab..61ee929 100644 --- a/docker-compose files/JDownloader2/docker-compose.yml +++ b/docker-compose files/JDownloader2/docker-compose.yml @@ -19,6 +19,12 @@ services: ports: - 10054:10054 # jdownloader2 WEB # - 10056:10056 # jdownloader2 VNC, if needed put the port in the jdownloader2 service + healthcheck: + test: ["CMD", "/gluetun-entrypoint", "healthcheck"] + interval: 20s + timeout: 20s + retries: 10 + start_period: 30s deploy: resources: limits: diff --git a/docker-compose files/qBittorrent/docker-compose.yml b/docker-compose files/qBittorrent/docker-compose.yml index b963dcd..714e34e 100644 --- a/docker-compose files/qBittorrent/docker-compose.yml +++ b/docker-compose files/qBittorrent/docker-compose.yml @@ -19,6 +19,12 @@ services: - 10095:10095 # qbittorrent WebUI - 6881:6881 # qbittorrent TCP - 6881:6881/udp # qbittorrent UDP + healthcheck: + test: ["CMD", "/gluetun-entrypoint", "healthcheck"] + interval: 20s + timeout: 20s + retries: 10 + start_period: 30s deploy: resources: limits: From 185a17763bf30b5539b1634b48184abc3291aa18 Mon Sep 17 00:00:00 2001 From: J0nan <46595866+J0nan@users.noreply.github.com> Date: Wed, 12 Mar 2025 11:25:07 +0100 Subject: [PATCH 17/22] Updated the version of Nuclei --- provisioning/kali/generic/PostSeed.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/kali/generic/PostSeed.sh b/provisioning/kali/generic/PostSeed.sh index 1a05437..52b8ef6 100644 --- a/provisioning/kali/generic/PostSeed.sh +++ b/provisioning/kali/generic/PostSeed.sh @@ -82,7 +82,7 @@ rm /home/kali/Downloads/dbeaber-ce.deb # Web applications tools # Nuclei echo -e "${Blue}[*] Installing nuclei${ColorOff}" -go install github.com/projectdiscovery/nuclei/v2/cmd/nuclei@latest +go install github.com/projectdiscovery/nuclei/v3/cmd/nuclei@latest # Interactsh echo -e "${Blue}[*] Installing interactsh${ColorOff}" From 71668d551c1ec93c93f34722b236c3b30e057b56 Mon Sep 17 00:00:00 2001 From: J0nan <46595866+J0nan@users.noreply.github.com> Date: Sun, 30 Mar 2025 17:22:42 +0200 Subject: [PATCH 18/22] Removed specific version of python due to possible conflict --- provisioning/kali/generic/PostSeed.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/kali/generic/PostSeed.sh b/provisioning/kali/generic/PostSeed.sh index 52b8ef6..3dcd0d0 100644 --- a/provisioning/kali/generic/PostSeed.sh +++ b/provisioning/kali/generic/PostSeed.sh @@ -31,7 +31,7 @@ chmod 664 /home/kali/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manage # General purpose tools # Python3 and PIP3 echo -e "${Blue}[*] Installing python3 ${ColorOff}" -apt install python3.12 python3.12-venv -y +apt install python3 python3-venv -y # git echo -e "${Blue}[*] Installing git${ColorOff}" From aba0eb2527dc2e622b7ffe197c30e5ec24875cbb Mon Sep 17 00:00:00 2001 From: J0nan <46595866+J0nan@users.noreply.github.com> Date: Sun, 30 Mar 2025 17:46:03 +0200 Subject: [PATCH 19/22] Update README.md --- provisioning/kali/generic/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provisioning/kali/generic/README.md b/provisioning/kali/generic/README.md index 65394d8..4ca6c3e 100644 --- a/provisioning/kali/generic/README.md +++ b/provisioning/kali/generic/README.md @@ -68,7 +68,7 @@ This script is executed by the installer after performing all the configurations ##### General Purpose -- python3.12 & python3.12-venv +- python3 & python3-venv - git - golang-go - docker (The services are disabled, use this to start them `systemctl start docker.service; systemctl start docker.socket`) From 534f9d4fa86aa4f1890dd6ac821039df4004c73c Mon Sep 17 00:00:00 2001 From: J0nan <46595866+J0nan@users.noreply.github.com> Date: Sun, 30 Mar 2025 18:32:32 +0200 Subject: [PATCH 20/22] Change hostname --- provisioning/kali/generic/PostSeed.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/provisioning/kali/generic/PostSeed.sh b/provisioning/kali/generic/PostSeed.sh index 3dcd0d0..07a191c 100644 --- a/provisioning/kali/generic/PostSeed.sh +++ b/provisioning/kali/generic/PostSeed.sh @@ -28,6 +28,9 @@ wget --no-check-certificate -O /home/kali/.config/xfce4/xfconf/xfce-perchannel-x chown -R kali:kali /home/kali/.config/xfce4/xfconf/xfce-perchannel-xml chmod 664 /home/kali/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml +# Change hostname to kali due to vbox changing it +hostnamectl set-hostname kali + # General purpose tools # Python3 and PIP3 echo -e "${Blue}[*] Installing python3 ${ColorOff}" From 1d5022411c6817b7acb103f2dc8b4f6f695428c7 Mon Sep 17 00:00:00 2001 From: J0nan <46595866+J0nan@users.noreply.github.com> Date: Sun, 30 Mar 2025 19:05:19 +0200 Subject: [PATCH 21/22] Update PostSeed.sh --- provisioning/kali/generic/PostSeed.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/provisioning/kali/generic/PostSeed.sh b/provisioning/kali/generic/PostSeed.sh index 07a191c..b67c077 100644 --- a/provisioning/kali/generic/PostSeed.sh +++ b/provisioning/kali/generic/PostSeed.sh @@ -30,6 +30,7 @@ chmod 664 /home/kali/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manage # Change hostname to kali due to vbox changing it hostnamectl set-hostname kali +echo "kali" > /etc/hostname # General purpose tools # Python3 and PIP3 From 7ada480125c2b111b051e30d440d8bde9f6b1cd4 Mon Sep 17 00:00:00 2001 From: J0nan <46595866+J0nan@users.noreply.github.com> Date: Wed, 9 Apr 2025 11:13:29 +0200 Subject: [PATCH 22/22] Removed the change in username --- provisioning/kali/generic/PostSeed.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/provisioning/kali/generic/PostSeed.sh b/provisioning/kali/generic/PostSeed.sh index b67c077..3dcd0d0 100644 --- a/provisioning/kali/generic/PostSeed.sh +++ b/provisioning/kali/generic/PostSeed.sh @@ -28,10 +28,6 @@ wget --no-check-certificate -O /home/kali/.config/xfce4/xfconf/xfce-perchannel-x chown -R kali:kali /home/kali/.config/xfce4/xfconf/xfce-perchannel-xml chmod 664 /home/kali/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml -# Change hostname to kali due to vbox changing it -hostnamectl set-hostname kali -echo "kali" > /etc/hostname - # General purpose tools # Python3 and PIP3 echo -e "${Blue}[*] Installing python3 ${ColorOff}"