Add support for new auth variables

This commit is contained in:
Syer10
2025-07-06 12:48:19 -04:00
parent 1e7c775741
commit fe65ce8873
4 changed files with 66 additions and 51 deletions

View File

@@ -117,11 +117,15 @@ jobs:
-e SOCKS_PROXY_ENABLED=false \
-e SOCKS_PROXY_HOST=socks_host \
-e SOCKS_PROXY_PORT=socks_port \
-e DOWNLOAD_AS_CBZ=true \
-e AUTH_MODE=basic_auth \
-e AUTH_USERNAME=manga \
-e AUTH_PASSWORD=hello123 \
-e DEBUG=true \
-e WEB_UI_ENABLED=true \
-e WEB_UI_FLAVOR=WebUI \
-e WEB_UI_CHANNEL=preview \
-e WEB_UI_UPDATE_INTERVAL=2 \
-e DOWNLOAD_AS_CBZ=true \
-e AUTO_DOWNLOAD_CHAPTERS=true \
-e AUTO_DOWNLOAD_EXCLUDE_UNREAD=false \
-e AUTO_DOWNLOAD_NEW_CHAPTERS_LIMIT=5 \
@@ -133,10 +137,6 @@ jobs:
-e UPDATE_EXCLUDE_COMPLETED=false \
-e UPDATE_INTERVAL=30 \
-e UPDATE_MANGA_INFO=true \
-e BASIC_AUTH_ENABLED=true \
-e BASIC_AUTH_USERNAME=manga \
-e BASIC_AUTH_PASSWORD=hello123 \
-e DEBUG=true \
-e BACKUP_TIME=13:37 \
-e BACKUP_INTERVAL=2 \
-e BACKUP_TTL=31 \
@@ -145,6 +145,13 @@ jobs:
-e FLARESOLVERR_TIMEOUT=30 \
-e FLARESOLVERR_SESSION_NAME=session-name \
-e FLARESOLVERR_SESSION_TTL=120 \
-e OPDS_USE_BINARY_FILE_SIZES=true \
-e OPDS_ITEMS_PER_PAGE=51 \
-e OPDS_ENABLE_PAGE_READ_PROGRESS=false \
-e OPDS_MARK_AS_READ_ON_DOWNLOAD=true \
-e OPDS_SHOW_ONLY_UNREAD_CHAPTERS=true \
-e OPDS_SHOW_ONLY_DOWNLOADED_CHAPTERS=true \
-e OPDS_CHAPTER_SORT_ORDER=ASC \
--name=suwayomi_test \
${{ env.test_image_tag }}
sleep 15

View File

@@ -36,7 +36,7 @@ Use the template [docker-compose.yml](./docker-compose.yml) in this repo for cre
There are a number of environment variables available to configure Suwayomi:
| Variable | Server Default | Description |
|:------------------------------------:|:-----------------------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
|:--------------------------------------:|:-----------------------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|
| **TZ** | `Etc/UTC` | What time zone the container thinks it is. |
| **BIND_IP** | `0.0.0.0` | The interface to listen on, inside the container. You almost never want to change this. |
| **BIND_PORT** | `4567` | Which port Suwayomi will listen on |
@@ -44,9 +44,9 @@ There are a number of environment variables available to configure Suwayomi:
| **SOCKS_PROXY_HOST** | ` ` | The TCP host of the SOCKS5 proxy |
| **SOCKS_PROXY_PORT** | ` ` | The port of the SOCKS5 proxy |
| **DOWNLOAD_AS_CBZ** | `false` | Whether Suwayomi should save the manga to disk in CBZ format |
| **BASIC_AUTH_ENABLED** | `false` | Whether Suwayomi requires HTTP Basic Auth to get in. |
| **BASIC_AUTH_USERNAME** | ` ` | The username to log in to Suwayomi. |
| **BASIC_AUTH_PASSWORD** | ` ` | The password to log in to Suwayomi. |
| **AUTH_MODE** | `none` | Whether Suwayomi requires a login to get in. `none` or `basic_auth` or `simple_login` |
| **AUTH_USERNAME** | ` ` | The username to log in to Suwayomi. |
| **AUTH_PASSWORD** | ` ` | The password to log in to Suwayomi. |
| **DEBUG** | `false` | If extra logging is enabled. Useful for development and troubleshooting. |
| **WEB_UI_ENABLED** | `true` | If the server should serve a webUI |
| **WEB_UI_FLAVOR** | `WebUI` | "WebUI" or "Custom" |

View File

@@ -3,6 +3,7 @@ version: '3.7'
services:
suwayomi:
image: ghcr.io/suwayomi/suwayomi-server:preview
# user: 1000:1000
environment:
- TZ=Etc/UTC # Use TZ database name from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# Comment these out if you do not use the flaresolverr container at the bottom of this file
@@ -22,9 +23,9 @@ services:
# - BIND_PORT=4567
# - SOCKS_PROXY_ENABLED=false
# - DOWNLOAD_AS_CBZ=true
# - BASIC_AUTH_ENABLED=true
# - BASIC_AUTH_USERNAME=manga
# - BASIC_AUTH_PASSWORD=hello123
# - AUTH_MODE=basic_auth
# - AUTH_USERNAME=manga
# - AUTH_PASSWORD=hello123
# - EXTENSION_REPOS=["http://github.com/orginazation-name/repo-name", "http://github.com/orginazation-name-2/repo-name-2"]
volumes:
- ./data:/home/suwayomi/.local/share/Tachidesk

View File

@@ -60,6 +60,13 @@ sed -i -r "s/server.globalUpdateInterval = ([0-9]+|[a-zA-Z]+)( #)?/server.global
sed -i -r "s/server.updateMangas = ([0-9]+|[a-zA-Z]+)( #)?/server.updateMangas = ${UPDATE_MANGA_INFO:-\1} #/" /home/suwayomi/.local/share/Tachidesk/server.conf
# Authentication
AUTH_MODE_VAL="${AUTH_MODE:-$( [ "$BASIC_AUTH_ENABLED" = "true" ] && echo 'basic_auth' )}"
AUTH_USERNAME_VAL="${AUTH_USERNAME:-$BASIC_AUTH_USERNAME}"
AUTH_PASSWORD_VAL="${AUTH_PASSWORD:-$BASIC_AUTH_PASSWORD}"
sed -i -r "s/server.authMode = \"(.*?)\"( #)?/server.authMode = ${AUTH_MODE_VAL:-\1} #/" /home/suwayomi/.local/share/Tachidesk/server.conf
sed -i -r "s/server.authUsername = \"(.*?)\"( #)?/server.authUsername = \"${AUTH_USERNAME_VAL:-\1}\" #/" /home/suwayomi/.local/share/Tachidesk/server.conf
sed -i -r "s/server.authPassword = \"(.*?)\"( #)?/server.authPassword = \"${AUTH_PASSWORD_VAL:-\1}\" #/" /home/suwayomi/.local/share/Tachidesk/server.conf
sed -i -r "s/server.basicAuthEnabled = ([0-9]+|[a-zA-Z]+)( #)?/server.basicAuthEnabled = ${BASIC_AUTH_ENABLED:-\1} #/" /home/suwayomi/.local/share/Tachidesk/server.conf
sed -i -r "s/server.basicAuthUsername = \"(.*?)\"( #)?/server.basicAuthUsername = \"${BASIC_AUTH_USERNAME:-\1}\" #/" /home/suwayomi/.local/share/Tachidesk/server.conf
sed -i -r "s/server.basicAuthPassword = \"(.*?)\"( #)?/server.basicAuthPassword = \"${BASIC_AUTH_PASSWORD:-\1}\" #/" /home/suwayomi/.local/share/Tachidesk/server.conf