From 30d9bf6728be4e4445e25256e8211094521d2bb0 Mon Sep 17 00:00:00 2001 From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com> Date: Sun, 4 Feb 2024 01:45:54 -0500 Subject: [PATCH] feat(taichidesk): Update old container + redo env_vars (#17714) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes #17569 **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --------- Signed-off-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> --- charts/stable/tachidesk-docker/Chart.yaml | 4 +- charts/stable/tachidesk-docker/questions.yaml | 187 +++++++++++++++++- charts/stable/tachidesk-docker/values.yaml | 66 +++++-- 3 files changed, 238 insertions(+), 19 deletions(-) diff --git a/charts/stable/tachidesk-docker/Chart.yaml b/charts/stable/tachidesk-docker/Chart.yaml index 0e2d63b1763..3f1ddf7aef9 100644 --- a/charts/stable/tachidesk-docker/Chart.yaml +++ b/charts/stable/tachidesk-docker/Chart.yaml @@ -7,7 +7,7 @@ annotations: truecharts.org/min_helm_version: "3.12" truecharts.org/train: stable apiVersion: v2 -appVersion: latest +appVersion: preview dependencies: - name: common version: 17.2.30 @@ -35,4 +35,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/tachidesk-docker - https://ghcr.io/suwayomi/tachidesk type: application -version: 4.1.11 +version: 5.0.0 diff --git a/charts/stable/tachidesk-docker/questions.yaml b/charts/stable/tachidesk-docker/questions.yaml index cab2c7b192d..4e10de4cc07 100644 --- a/charts/stable/tachidesk-docker/questions.yaml +++ b/charts/stable/tachidesk-docker/questions.yaml @@ -9,6 +9,185 @@ questions: # Include{replicas1} # Include{podSpec} # Include{containerMain} + - variable: env + group: "App Configuration" + label: "Image Environment" + schema: + additional_attrs: true + type: dict + attrs: + - variable: SOCKS_PROXY_ENABLED + label: "Enable Socks Proxy" + description: "Whether Suwayomi will connect through a SOCKS5 proxy" + schema: + type: boolean + default: false + - variable: SOCKS_PROXY_HOST + label: "SOCKS Proxy TCP Host" + description: "The TCP host of the SOCKS5 proxy" + schema: + show_if: [["SOCKS_PROXY_ENABLED", "=", true]] + type: string + default: "" + - variable: SOCKS_PROXY_PORT + label: "SOCKS Proxy PORT" + description: "The port of the SOCKS5 proxy" + schema: + show_if: [["SOCKS_PROXY_ENABLED", "=", true]] + type: string + default: "" + - variable: DOWNLOAD_AS_CBZ + label: "Download in CBZ format" + description: "Whether Suwayomi should save the manga to disk in CBZ format" + schema: + type: boolean + default: false + - variable: BASIC_AUTH_ENABLED + label: "Enabled Basic Authentication" + description: "Whether Suwayomi requires HTTP Basic Auth to get in." + schema: + type: boolean + default: false + - variable: BASIC_AUTH_USERNAME + label: "Basic Auth Username" + description: "Enter User" + schema: + show_if: [["BASIC_AUTH_ENABLED", "=", true]] + type: string + default: "" + - variable: BASIC_AUTH_PASSWORD + label: "Basic Auth Password" + description: "Enter Password" + schema: + show_if: [["BASIC_AUTH_ENABLED", "=", true]] + type: string + default: "" + - variable: DEBUG + label: "Enable DEBUG mode" + description: "If extra logging is enabled. Useful for development and troubleshooting." + schema: + type: boolean + default: false + - variable: GQL_DEBUG + label: "Enable GQL_DEBUG mode" + description: "If graphql logging is enabled. Useful for development and troubleshooting. Can overload the log output." + schema: + type: boolean + default: false + - variable: AUTO_DOWNLOAD_CHAPTERS + label: "Automatic Download Chapters" + description: "If new chapters that have been retrieved should get automatically downloaded" + schema: + type: boolean + default: false + - variable: AUTO_DOWNLOAD_EXCLUDE_UNREAD + label: "Exclude Unread Automatic Download Chapters" + description: "Ignore automatic chapter downloads of entries with unread chapters" + schema: + type: boolean + default: true + - variable: AUTO_DOWNLOAD_AHEAD_LIMIT + label: "Auto Download Chapters Ahead Limit" + description: "0 to disable - how many unread downloaded chapters should be available - if the limit is reached, new chapters won't be downloaded automatically" + schema: + type: int + default: 0 + - variable: EXTENSION_REPOS + label: "Additional Extension Repo" + description: "Any additional extension repos to use" + schema: + type: string + default: "" + - variable: MAX_SOURCES_IN_PARALLEL + label: "Max Sources (Uploads/Downloads) in Parallel" + description: "Between 1 and 20 - Sets how many sources can do requests (updates, downloads) in parallel. Updates/Downloads are grouped by source and all mangas of a source are updated/downloaded synchronously" + schema: + type: int + default: 6 + - variable: UPDATE_EXCLUDE_UNREAD + label: "Exclude Unread Manga" + description: "If unread manga should be excluded from updates" + schema: + type: boolean + default: true + - variable: UPDATE_EXCLUDE_STARTED + label: "Exclude Started Manga" + description: "If started manga should be excluded from updates" + schema: + type: boolean + default: true + - variable: UPDATE_EXCLUDE_COMPLETED + label: "Exclude completed Manga" + description: "If completed manga should be excluded from updates" + schema: + type: boolean + default: true + - variable: UPDATE_INTERVAL + label: "Global Update Interval" + description: "Time in hours (0 to disable it) for the innterval in which the global update will be automatically triggered" + schema: + type: int + default: 12 + - variable: UPDATE_MANGA_INFO + label: "Update Manga Info" + description: "If manga info should be updated along with the chapters" + schema: + type: boolean + default: false + - variable: BACKUP_TIME + label: "Backup Time in 00:00 format" + description: " Range: hour: 0-23, minute: 0-59 - Time of day at which the automated backup should be triggered" + schema: + type: string + default: "00:00" + - variable: BACKUP_INTERVAL + label: "Backup Update Interval" + description: "Time in days (0 to disable it) for the interval in which the server will automatically create a backup" + schema: + type: int + default: 1 + - variable: BACKUP_TTL + label: "Backup Retentions Interval" + description: "Time in days (0 to disable it) for how long backup files will be kept before they will get deleted" + schema: + type: int + default: 1 + - variable: FLARESOLVERR_ENABLED + label: "Enable Flaresolverr" + description: "Whether FlareSolverr is enabled and available to use" + schema: + type: boolean + default: false + - variable: FLARESOLVERR_URL + label: "Flaresolverr URL" + description: "The URL of the FlareSolverr instance" + schema: + type: string + default: "" + - variable: FLARESOLVERR_TIMEOUT + label: "Flaresolverr Timeout in Seconds" + description: "Time in days (0 to disable it) for how long backup files will be kept before they will get deleted" + schema: + type: int + default: 60 + - variable: FLARESOLVERR_TIMEOUT + label: "Flaresolverr Timeout in Seconds" + description: "Time in seconds before it times out" + schema: + type: int + default: 60 + - variable: FLARESOLVERR_SESSION_NAME + label: "Flaresolverr Session Name" + description: "The name of the session that Suwayomi will use with FlareSolverr" + schema: + type: string + default: "suwayomi" + - variable: FLARESOLVERR_SESSION_TTL + label: "Flaresolverr Session TTL " + description: "The time to live for the FlareSolverr session" + schema: + type: int + default: 15 # Include{containerBasic} # Include{containerAdvanced} # Include{containerConfig} @@ -49,7 +228,7 @@ questions: attrs: # Include{persistenceBasic} - variable: library - label: "library Storage" + label: "Downloads Storage" description: "(Optional) Path to where your Downloads should be stored.Default is in Appdata folder." schema: additional_attrs: true @@ -57,7 +236,7 @@ questions: attrs: # Include{persistenceBasic} - variable: local-library - label: "local-library Storage" + label: "Local Library Storage" description: "(Optional) You can add your local Library here.Should work like standard Tachiyomi.(httpstachiyomi.orghelpguideslocal-manga)" schema: additional_attrs: true @@ -81,13 +260,13 @@ questions: description: "The UserID of the user running the application" schema: type: int - default: 0 + default: 568 - variable: runAsGroup label: "runAsGroup" description: "The groupID of the user running the application" schema: type: int - default: 0 + default: 568 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} diff --git a/charts/stable/tachidesk-docker/values.yaml b/charts/stable/tachidesk-docker/values.yaml index 1cd75a949c8..b364f15ffa4 100644 --- a/charts/stable/tachidesk-docker/values.yaml +++ b/charts/stable/tachidesk-docker/values.yaml @@ -1,7 +1,58 @@ image: pullPolicy: IfNotPresent repository: ghcr.io/suwayomi/tachidesk - tag: latest@sha256:2782f5b40fafccb21ff6bdbaed7594804c2aa043ba9a42727a19fb6e07397fbb + tag: preview@sha256:60a5ee1bfe32d7b0a74db26aa94822c16bcfc9e588e23727bb8a2b97577a4343 + +securityContext: + container: + readOnlyRootFilesystem: false + +workload: + main: + podSpec: + containers: + main: + env: + BIND_IP: "0.0.0.0" + BIND_PORT: "{{ .Values.service.main.ports.main.port }}" + SOCKS_PROXY_ENABLED: false + SOCKS_PROXY_HOST: "" + SOCKS_PROXY_PORT: "" + DOWNLOAD_AS_CBZ: true + BASIC_AUTH_ENABLED: false + BASIC_AUTH_USERNAME: "" + BASIC_AUTH_PASSWORD: "" + DEBUG: false + GQL_DEBUG: false + WEB_UI_ENABLED: true + WEB_UI_FLAVOR: "WebUI" + WEB_UI_CHANNEL: "stable" + WEB_UI_UPDATE_INTERVAL: 23 + AUTO_DOWNLOAD_CHAPTERS: false + AUTO_DOWNLOAD_EXCLUDE_UNREAD: true + AUTO_DOWNLOAD_AHEAD_LIMIT: 0 + EXTENSION_REPOS: "" + MAX_SOURCES_IN_PARALLEL: 6 + UPDATE_EXCLUDE_UNREAD: true + UPDATE_EXCLUDE_STARTED: true + UPDATE_EXCLUDE_COMPLETED: true + UPDATE_INTERVAL: 12 + UPDATE_MANGA_INFO: false + BACKUP_TIME: "" + BACKUP_INTERVAL: 1 + BACKUP_TTL: 14 + FLARESOLVERR_ENABLED: false + FLARESOLVERR_URL: "" + FLARESOLVERR_TIMEOUT: 60 + FLARESOLVERR_SESSION_NAME: "suwayomi" + FLARESOLVERR_SESSION_TTL: 15 + +service: + main: + ports: + main: + port: 4567 + persistence: appdata: enabled: true @@ -12,18 +63,7 @@ persistence: local-library: enabled: true mountPath: /home/suwayomi/.local/share/Tachidesk/local + portal: open: enabled: true -securityContext: - container: - readOnlyRootFilesystem: false - runAsGroup: 0 - runAsUser: 0 -service: - main: - ports: - main: - port: 4567 - protocol: tcp - targetPort: 4567