diff --git a/charts/incubator/grocy/SCALE/questions.yaml b/charts/incubator/grocy/SCALE/questions.yaml index f1af3711d40..a0fb452abc8 100644 --- a/charts/incubator/grocy/SCALE/questions.yaml +++ b/charts/incubator/grocy/SCALE/questions.yaml @@ -74,7 +74,6 @@ questions: schema: type: int default: 568 - - variable: PGID label: "PGID" description: "Sets the PGID env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/heimdall/SCALE/questions.yaml b/charts/incubator/heimdall/SCALE/questions.yaml index da7f7db6fbe..d92632debad 100644 --- a/charts/incubator/heimdall/SCALE/questions.yaml +++ b/charts/incubator/heimdall/SCALE/questions.yaml @@ -61,13 +61,13 @@ questions: schema: type: dict attrs: - - variable: timezone - label: "Timezone" - schema: - type: string - default: "Etc/UTC" - $ref: - - "definitions/timezone" + - variable: timezone + label: "Timezone" + schema: + type: string + default: "Etc/UTC" + $ref: + - "definitions/timezone" - variable: PUID label: "PUID" description: "Sets the PUID env var for LinuxServer.io (compatible) containers" diff --git a/charts/incubator/unifi/SCALE/ix_values.yaml b/charts/incubator/unifi/SCALE/ix_values.yaml index 44a5d83c850..8fd80a5cc27 100644 --- a/charts/incubator/unifi/SCALE/ix_values.yaml +++ b/charts/incubator/unifi/SCALE/ix_values.yaml @@ -9,12 +9,10 @@ image: tag: 6.1.71 pullPolicy: IfNotPresent - envTpl: -# Permissions Settings - UNIFI_GID: "568" - UNIFI_UID: "568" - + # Permissions Settings + UNIFI_GID: "{ { .env.PUID } }" + UNIFI_UID: "{ { .env.PGID } }" ## # Most other defaults are set in questions.yaml # For other options please refer to the wiki, default_values.yaml or the common library chart diff --git a/charts/incubator/unifi/values.yaml b/charts/incubator/unifi/values.yaml index 69324c7fdc0..0e6d72e2011 100644 --- a/charts/incubator/unifi/values.yaml +++ b/charts/incubator/unifi/values.yaml @@ -9,9 +9,9 @@ strategy: type: Recreate envTpl: -# Permissions Settings - UNIFI_GID: "568" - UNIFI_UID: "568" + # Permissions Settings + UNIFI_GID: "{ { .env.PUID } }" + UNIFI_UID: "{ { .env.PGID } }" service: main: @@ -35,10 +35,10 @@ service: port: 3478 protocol: UDP -env: {} +env: # TZ: - # PUID: - # PGID: + PUID: "568" + PGID: "568" persistence: config: diff --git a/charts/stable/deepstack-cpu/SCALE/ix_values.yaml b/charts/stable/deepstack-cpu/SCALE/ix_values.yaml index c684d8ec8bd..4886ddc0a6d 100644 --- a/charts/stable/deepstack-cpu/SCALE/ix_values.yaml +++ b/charts/stable/deepstack-cpu/SCALE/ix_values.yaml @@ -11,8 +11,8 @@ image: envTpl: # Permissions Settings - USER_ID: "568" - GROUP_ID: "568" + USER_ID: "{ { .env.PUID } }" + GROUP_ID: "{ { .env.PGID } }" ## # Most other defaults are set in questions.yaml # For other options please refer to the wiki, default_values.yaml or the common library chart diff --git a/charts/stable/deepstack-cpu/SCALE/questions.yaml b/charts/stable/deepstack-cpu/SCALE/questions.yaml index dd2b17b3fd3..ff8394e77c7 100644 --- a/charts/stable/deepstack-cpu/SCALE/questions.yaml +++ b/charts/stable/deepstack-cpu/SCALE/questions.yaml @@ -56,6 +56,7 @@ questions: description: "Create new pods and then kill old ones" - value: "Recreate" description: "Kill existing pods before creating new ones" + # Configure Enviroment Variables - variable: env group: "Configuration" label: "Image Environment" @@ -87,33 +88,6 @@ questions: schema: type: string default: "002" - # Configure Enviroment Variables - - variable: envList - label: "Image environment" - group: "Configuration" - schema: - type: list - default: [] - items: - - variable: envItem - label: "Environment Variable" - schema: - type: dict - attrs: - - variable: name - label: "Name" - schema: - type: string - - variable: value - label: "Value" - schema: - type: string - - variable: env - group: "Configuration" - label: "Image Environment" - schema: - type: dict - attrs: - variable: VISION-FACE label: "VISION-FACE" description: "Enables Face Detection" @@ -167,6 +141,26 @@ questions: type: string default: "/modelstore/detection" required: true + - variable: envList + label: "Image environment" + group: "Configuration" + schema: + type: list + default: [] + items: + - variable: envItem + label: "Environment Variable" + schema: + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string # Enable Host Networking - variable: hostNetwork group: "Networking" diff --git a/charts/stable/deepstack-cpu/values.yaml b/charts/stable/deepstack-cpu/values.yaml index 877d0bb4fe8..2a7f3733d8a 100644 --- a/charts/stable/deepstack-cpu/values.yaml +++ b/charts/stable/deepstack-cpu/values.yaml @@ -17,16 +17,20 @@ service: envTpl: # Permissions Settings - USER_ID: "568" - GROUP_ID: "568" + USER_ID: "{ { .env.PUID } }" + GROUP_ID: "{ { .env.PGID } }" env: + PUID: "568" + PGID: "568" # TZ: UTC VISION-FACE: "True" VISION-DETECTION: "True" VISION-SCENE: "True" - MODELSTORE-DETECTION: "/modelstore/detection" # Path to custom models (needs to be on documentation) - MODE: "High" # High|Medium|Low + # Path to custom models (needs to be on documentation) + MODELSTORE-DETECTION: "/modelstore/detection" + # High|Medium|Low + MODE: "High" persistence: config: diff --git a/charts/stable/emby/SCALE/ix_values.yaml b/charts/stable/emby/SCALE/ix_values.yaml index d6026df4642..041b6616872 100644 --- a/charts/stable/emby/SCALE/ix_values.yaml +++ b/charts/stable/emby/SCALE/ix_values.yaml @@ -9,6 +9,7 @@ image: pullPolicy: IfNotPresent tag: v4.5.4.0 +# 44=video 107=render podSecurityContext: runAsNonRoot: true runAsUser: 568 diff --git a/charts/stable/emby/SCALE/questions.yaml b/charts/stable/emby/SCALE/questions.yaml index b74e8f35c9f..40c6e24a7ec 100644 --- a/charts/stable/emby/SCALE/questions.yaml +++ b/charts/stable/emby/SCALE/questions.yaml @@ -360,18 +360,6 @@ questions: schema: type: int default: 568 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." diff --git a/charts/stable/emby/values.yaml b/charts/stable/emby/values.yaml index e4395bc2e31..c50b2d79fa9 100644 --- a/charts/stable/emby/values.yaml +++ b/charts/stable/emby/values.yaml @@ -8,6 +8,7 @@ image: strategy: type: Recreate +# 44=video 107=render podSecurityContext: runAsNonRoot: true runAsUser: 568 diff --git a/charts/stable/handbrake/SCALE/ix_values.yaml b/charts/stable/handbrake/SCALE/ix_values.yaml index 4eea1bb3dd9..a47a4681e9c 100644 --- a/charts/stable/handbrake/SCALE/ix_values.yaml +++ b/charts/stable/handbrake/SCALE/ix_values.yaml @@ -11,10 +11,9 @@ image: #All values here are set as the docker defaults. envTpl: -# Permissions Settings - USER_ID: "568" - GROUP_ID: "568" - + # Permissions Settings + USER_ID: "{{ .Values.env.PUID }}" + GROUP_ID: "{{ .Values.env.PGID }}" ## # Most other defaults are set in questions.yaml # For other options please refer to the wiki, default_values.yaml or the common library chart diff --git a/charts/stable/handbrake/SCALE/questions.yaml b/charts/stable/handbrake/SCALE/questions.yaml index 6280a42ff97..6248c3b7596 100644 --- a/charts/stable/handbrake/SCALE/questions.yaml +++ b/charts/stable/handbrake/SCALE/questions.yaml @@ -74,46 +74,19 @@ questions: description: "Sets the PUID env var for LinuxServer.io (compatible) containers" schema: type: int - default: 568 + default: 0 - variable: PGID label: "PGID" description: "Sets the PGID env var for LinuxServer.io (compatible) containers" schema: type: int - default: 568 + default: 0 - variable: UMASK label: "UMASK" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" schema: type: string default: "002" - # Configure Enviroment Variables - - variable: envList - label: "Image environment" - group: "Configuration" - schema: - type: list - default: [] - items: - - variable: envItem - label: "Environment Variable" - schema: - type: dict - attrs: - - variable: name - label: "Name" - schema: - type: string - - variable: value - label: "Value" - schema: - type: string - - variable: env - group: "Configuration" - label: "Image Environment" - schema: - type: dict - attrs: - variable: gui label: "GUI Settings" description: "Always read description before changing a value here. Also refer to README" @@ -186,6 +159,26 @@ questions: type: string default: "ignore" required: true + - variable: envList + label: "Image environment" + group: "Configuration" + schema: + type: list + default: [] + items: + - variable: envItem + label: "Environment Variable" + schema: + type: dict + attrs: + - variable: name + label: "Name" + schema: + type: string + - variable: value + label: "Value" + schema: + type: string # Enable Host Networking - variable: hostNetwork group: "Networking" diff --git a/charts/stable/handbrake/values.yaml b/charts/stable/handbrake/values.yaml index f5528cbd2eb..6bb6626cf18 100644 --- a/charts/stable/handbrake/values.yaml +++ b/charts/stable/handbrake/values.yaml @@ -22,20 +22,23 @@ service: # All values here are set as the docker defaults. envTpl: -# Permissions Settings - USER_ID: "568" - GROUP_ID: "568" + # Permissions Settings + USER_ID: "{{ .Values.env.PUID }}" + GROUP_ID: "{{ .Values.env.PGID }}" env: -# General Settings + # Permissions Settings + PUID: "0" + PGID: "0" + # General Settings KEEP_APP_RUNNING: "0" CLEAN_TMP_DIR: "1" -# GUI Settings + # GUI Settings DISPLAY_WIDTH: "1280" DISPLAY_HEIGHT: "768" SECURE_CONNECTION: "0" VNC_PASSWORD: -# Automated Conversion Preset + # Automated Conversion Preset AUTOMATED_CONVERSION_PRESET: "General/Very Fast 1080p30" AUTOMATED_CONVERSION_FORMAT: "mp4" AUTOMATED_CONVERSION_KEEP_SOURCE: "1" diff --git a/charts/stable/jellyfin/SCALE/ix_values.yaml b/charts/stable/jellyfin/SCALE/ix_values.yaml index 052571ff341..13fabd7f7fe 100644 --- a/charts/stable/jellyfin/SCALE/ix_values.yaml +++ b/charts/stable/jellyfin/SCALE/ix_values.yaml @@ -9,6 +9,7 @@ image: pullPolicy: IfNotPresent tag: 10.7.5 +# 44=video 107=render podSecurityContext: runAsNonRoot: true runAsUser: 568 diff --git a/charts/stable/jellyfin/SCALE/questions.yaml b/charts/stable/jellyfin/SCALE/questions.yaml index 01a898256fa..1d9fbac05d9 100644 --- a/charts/stable/jellyfin/SCALE/questions.yaml +++ b/charts/stable/jellyfin/SCALE/questions.yaml @@ -360,18 +360,6 @@ questions: schema: type: int default: 568 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." diff --git a/charts/stable/jellyfin/values.yaml b/charts/stable/jellyfin/values.yaml index c539306b882..d12fe40141d 100644 --- a/charts/stable/jellyfin/values.yaml +++ b/charts/stable/jellyfin/values.yaml @@ -8,6 +8,7 @@ image: strategy: type: Recreate +# 44=video 107=render podSecurityContext: runAsNonRoot: true runAsUser: 568 diff --git a/charts/stable/plex/SCALE/ix_values.yaml b/charts/stable/plex/SCALE/ix_values.yaml index 868b3d4ba0a..407a82054aa 100644 --- a/charts/stable/plex/SCALE/ix_values.yaml +++ b/charts/stable/plex/SCALE/ix_values.yaml @@ -9,6 +9,7 @@ image: pullPolicy: IfNotPresent tag: v1.22.1.4228-724c56e62 +# 44=video 107=render podSecurityContext: runAsNonRoot: true runAsUser: 568 diff --git a/charts/stable/plex/SCALE/questions.yaml b/charts/stable/plex/SCALE/questions.yaml index d53919ef3ea..16be9feb20b 100644 --- a/charts/stable/plex/SCALE/questions.yaml +++ b/charts/stable/plex/SCALE/questions.yaml @@ -378,18 +378,6 @@ questions: schema: type: int default: 568 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." diff --git a/charts/stable/plex/values.yaml b/charts/stable/plex/values.yaml index dcb98ac2023..4407c045b4a 100644 --- a/charts/stable/plex/values.yaml +++ b/charts/stable/plex/values.yaml @@ -8,6 +8,7 @@ image: strategy: type: Recreate +# 44=video 107=render podSecurityContext: runAsNonRoot: true runAsUser: 568 diff --git a/charts/stable/zwavejs2mqtt/SCALE/ix_values.yaml b/charts/stable/zwavejs2mqtt/SCALE/ix_values.yaml index a90bf487585..c9a3b847f83 100644 --- a/charts/stable/zwavejs2mqtt/SCALE/ix_values.yaml +++ b/charts/stable/zwavejs2mqtt/SCALE/ix_values.yaml @@ -9,6 +9,7 @@ image: pullPolicy: IfNotPresent tag: 2.4.1 +# 5=tty 20=dialout 24=cdrom podSecurityContext: runAsNonRoot: true runAsUser: 568 diff --git a/charts/stable/zwavejs2mqtt/SCALE/questions.yaml b/charts/stable/zwavejs2mqtt/SCALE/questions.yaml index b7e65057058..595abc6f850 100644 --- a/charts/stable/zwavejs2mqtt/SCALE/questions.yaml +++ b/charts/stable/zwavejs2mqtt/SCALE/questions.yaml @@ -473,18 +473,6 @@ questions: schema: type: int default: 568 - - variable: supplementalGroups - label: "supplementalGroups" - description: "Additional groups this App needs access to" - schema: - type: list - default: [] - items: - - variable: Group - label: "Group" - schema: - type: int - default: 568 - variable: fsGroup label: "fsGroup" description: "The group that should own ALL storage." diff --git a/charts/stable/zwavejs2mqtt/values.yaml b/charts/stable/zwavejs2mqtt/values.yaml index 85f4a9324b4..505bf6f88f0 100644 --- a/charts/stable/zwavejs2mqtt/values.yaml +++ b/charts/stable/zwavejs2mqtt/values.yaml @@ -10,6 +10,7 @@ image: strategy: type: Recreate +# 5=tty 20=dialout 24=cdrom podSecurityContext: runAsNonRoot: true runAsUser: 568