From 4f1dafcb6222828528d1fbc6148204ca15a908ae Mon Sep 17 00:00:00 2001 From: technorabilia Date: Wed, 24 May 2023 00:55:18 +0000 Subject: [PATCH] Workflow update --- lsio/bookstack/docker-compose.yaml | 6 +++--- lsio/bookstack/docker-run.sh | 2 +- lsio/wireguard/docker-compose.yaml | 3 +++ lsio/wireguard/docker-run.sh | 2 ++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lsio/bookstack/docker-compose.yaml b/lsio/bookstack/docker-compose.yaml index 7c5794c..b3bf0f8 100644 --- a/lsio/bookstack/docker-compose.yaml +++ b/lsio/bookstack/docker-compose.yaml @@ -15,14 +15,14 @@ services: environment: - PUID=1000 - PGID=1000 - - APP_URL= + - APP_URL=https://bookstack.example.com - DB_HOST=bookstack_db - DB_PORT=3306 - DB_USER=bookstack - DB_PASS= - DB_DATABASE=bookstackapp volumes: - - /path/to/data:/config + - ./bookstack_app_data:/config ports: - 6875:80 restart: unless-stopped @@ -40,6 +40,6 @@ services: - MYSQL_USER=bookstack - MYSQL_PASSWORD= volumes: - - /path/to/data:/config + - ./bookstack_db_data:/config restart: unless-stopped diff --git a/lsio/bookstack/docker-run.sh b/lsio/bookstack/docker-run.sh index 62948b7..0263e28 100644 --- a/lsio/bookstack/docker-run.sh +++ b/lsio/bookstack/docker-run.sh @@ -12,7 +12,7 @@ docker run -d \ -e PUID=${PUID:-1024} `# for UserID` \ -e PGID=${PGID:-100} `# for GroupID` \ -e TZ=${TZ:-Europe/Amsterdam} `# specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List).` \ - -e APP_URL= `# for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`` \ + -e APP_URL= `# for specifying the IP:port or URL your application will be accessed on (ie. `http://192.168.1.1:6875` or `https://bookstack.mydomain.com`` \ -e DB_HOST= `# for specifying the database host` \ -e DB_PORT= `# for specifying the database port if not default 3306` \ -e DB_USER= `# for specifying the database user` \ diff --git a/lsio/wireguard/docker-compose.yaml b/lsio/wireguard/docker-compose.yaml index 83cd620..9fb5a3f 100644 --- a/lsio/wireguard/docker-compose.yaml +++ b/lsio/wireguard/docker-compose.yaml @@ -17,6 +17,7 @@ services: container_name: wireguard cap_add: - NET_ADMIN + - SYS_MODULE # optional environment: # for UserID - PUID=${PUID:-1024} @@ -43,6 +44,8 @@ services: volumes: # Contains all relevant configuration files. - ${BASEDIR:-/volume1/docker}/wireguard/config:/config + # Host kernel modules for situations where they're not already loaded. + - /lib/modules:/lib/modules # optional ports: # wireguard port - 51820:51820/udp diff --git a/lsio/wireguard/docker-run.sh b/lsio/wireguard/docker-run.sh index 002e4cb..a35ca8b 100644 --- a/lsio/wireguard/docker-run.sh +++ b/lsio/wireguard/docker-run.sh @@ -13,6 +13,7 @@ docker run -d \ --name=wireguard \ --cap-add=NET_ADMIN \ + --cap-add=SYS_MODULE `# optional` \ -e PUID=${PUID:-1024} `# for UserID` \ -e PGID=${PGID:-100} `# for GroupID` \ -e TZ=${TZ:-Europe/Amsterdam} `# specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List).` \ @@ -26,6 +27,7 @@ docker run -d \ -e LOG_CONFS=true `# optional` `# Generated QR codes will be displayed in the docker log. Set to `false` to skip log output.` \ -p 51820:51820/udp `# wireguard port` \ -v ${BASEDIR:-/volume1/docker}/wireguard/config:/config `# Contains all relevant configuration files.` \ + -v /lib/modules:/lib/modules `# optional` `# Host kernel modules for situations where they're not already loaded.` \ --sysctl="net.ipv4.conf.all.src_valid_mark=1" \ --restart unless-stopped \ ghcr.io/linuxserver/wireguard