Common 4.0 App Refactor Part 7 - Stavos

This commit is contained in:
Stavros Kois
2021-05-23 18:26:23 +02:00
committed by kjeld Schouten-Lebbing
parent ad4a2ae785
commit 69f3be4e6b
22 changed files with 89 additions and 139 deletions
@@ -74,7 +74,6 @@ questions:
schema: schema:
type: int type: int
default: 568 default: 568
- variable: PGID - variable: PGID
label: "PGID" label: "PGID"
description: "Sets the PGID env var for LinuxServer.io (compatible) containers" description: "Sets the PGID env var for LinuxServer.io (compatible) containers"
@@ -61,13 +61,13 @@ questions:
schema: schema:
type: dict type: dict
attrs: attrs:
- variable: timezone - variable: timezone
label: "Timezone" label: "Timezone"
schema: schema:
type: string type: string
default: "Etc/UTC" default: "Etc/UTC"
$ref: $ref:
- "definitions/timezone" - "definitions/timezone"
- variable: PUID - variable: PUID
label: "PUID" label: "PUID"
description: "Sets the PUID env var for LinuxServer.io (compatible) containers" description: "Sets the PUID env var for LinuxServer.io (compatible) containers"
+3 -5
View File
@@ -9,12 +9,10 @@ image:
tag: 6.1.71 tag: 6.1.71
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
envTpl: envTpl:
# Permissions Settings # Permissions Settings
UNIFI_GID: "568" UNIFI_GID: "{ { .env.PUID } }"
UNIFI_UID: "568" UNIFI_UID: "{ { .env.PGID } }"
## ##
# Most other defaults are set in questions.yaml # Most other defaults are set in questions.yaml
# For other options please refer to the wiki, default_values.yaml or the common library chart # For other options please refer to the wiki, default_values.yaml or the common library chart
+6 -6
View File
@@ -9,9 +9,9 @@ strategy:
type: Recreate type: Recreate
envTpl: envTpl:
# Permissions Settings # Permissions Settings
UNIFI_GID: "568" UNIFI_GID: "{ { .env.PUID } }"
UNIFI_UID: "568" UNIFI_UID: "{ { .env.PGID } }"
service: service:
main: main:
@@ -35,10 +35,10 @@ service:
port: 3478 port: 3478
protocol: UDP protocol: UDP
env: {} env:
# TZ: # TZ:
# PUID: PUID: "568"
# PGID: PGID: "568"
persistence: persistence:
config: config:
@@ -11,8 +11,8 @@ image:
envTpl: envTpl:
# Permissions Settings # Permissions Settings
USER_ID: "568" USER_ID: "{ { .env.PUID } }"
GROUP_ID: "568" GROUP_ID: "{ { .env.PGID } }"
## ##
# Most other defaults are set in questions.yaml # Most other defaults are set in questions.yaml
# For other options please refer to the wiki, default_values.yaml or the common library chart # For other options please refer to the wiki, default_values.yaml or the common library chart
@@ -56,6 +56,7 @@ questions:
description: "Create new pods and then kill old ones" description: "Create new pods and then kill old ones"
- value: "Recreate" - value: "Recreate"
description: "Kill existing pods before creating new ones" description: "Kill existing pods before creating new ones"
# Configure Enviroment Variables
- variable: env - variable: env
group: "Configuration" group: "Configuration"
label: "Image Environment" label: "Image Environment"
@@ -87,33 +88,6 @@ questions:
schema: schema:
type: string type: string
default: "002" 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 - variable: VISION-FACE
label: "VISION-FACE" label: "VISION-FACE"
description: "Enables Face Detection" description: "Enables Face Detection"
@@ -167,6 +141,26 @@ questions:
type: string type: string
default: "/modelstore/detection" default: "/modelstore/detection"
required: true 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 # Enable Host Networking
- variable: hostNetwork - variable: hostNetwork
group: "Networking" group: "Networking"
+8 -4
View File
@@ -17,16 +17,20 @@ service:
envTpl: envTpl:
# Permissions Settings # Permissions Settings
USER_ID: "568" USER_ID: "{ { .env.PUID } }"
GROUP_ID: "568" GROUP_ID: "{ { .env.PGID } }"
env: env:
PUID: "568"
PGID: "568"
# TZ: UTC # TZ: UTC
VISION-FACE: "True" VISION-FACE: "True"
VISION-DETECTION: "True" VISION-DETECTION: "True"
VISION-SCENE: "True" VISION-SCENE: "True"
MODELSTORE-DETECTION: "/modelstore/detection" # Path to custom models (needs to be on documentation) # Path to custom models (needs to be on documentation)
MODE: "High" # High|Medium|Low MODELSTORE-DETECTION: "/modelstore/detection"
# High|Medium|Low
MODE: "High"
persistence: persistence:
config: config:
+1
View File
@@ -9,6 +9,7 @@ image:
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
tag: v4.5.4.0 tag: v4.5.4.0
# 44=video 107=render
podSecurityContext: podSecurityContext:
runAsNonRoot: true runAsNonRoot: true
runAsUser: 568 runAsUser: 568
-12
View File
@@ -360,18 +360,6 @@ questions:
schema: schema:
type: int type: int
default: 568 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 - variable: fsGroup
label: "fsGroup" label: "fsGroup"
description: "The group that should own ALL storage." description: "The group that should own ALL storage."
+1
View File
@@ -8,6 +8,7 @@ image:
strategy: strategy:
type: Recreate type: Recreate
# 44=video 107=render
podSecurityContext: podSecurityContext:
runAsNonRoot: true runAsNonRoot: true
runAsUser: 568 runAsUser: 568
+3 -4
View File
@@ -11,10 +11,9 @@ image:
#All values here are set as the docker defaults. #All values here are set as the docker defaults.
envTpl: envTpl:
# Permissions Settings # Permissions Settings
USER_ID: "568" USER_ID: "{{ .Values.env.PUID }}"
GROUP_ID: "568" GROUP_ID: "{{ .Values.env.PGID }}"
## ##
# Most other defaults are set in questions.yaml # Most other defaults are set in questions.yaml
# For other options please refer to the wiki, default_values.yaml or the common library chart # For other options please refer to the wiki, default_values.yaml or the common library chart
+22 -29
View File
@@ -74,46 +74,19 @@ questions:
description: "Sets the PUID env var for LinuxServer.io (compatible) containers" description: "Sets the PUID env var for LinuxServer.io (compatible) containers"
schema: schema:
type: int type: int
default: 568 default: 0
- variable: PGID - variable: PGID
label: "PGID" label: "PGID"
description: "Sets the PGID env var for LinuxServer.io (compatible) containers" description: "Sets the PGID env var for LinuxServer.io (compatible) containers"
schema: schema:
type: int type: int
default: 568 default: 0
- variable: UMASK - variable: UMASK
label: "UMASK" label: "UMASK"
description: "Sets the UMASK env var for LinuxServer.io (compatible) containers" description: "Sets the UMASK env var for LinuxServer.io (compatible) containers"
schema: schema:
type: string type: string
default: "002" 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 - variable: gui
label: "GUI Settings" label: "GUI Settings"
description: "Always read description before changing a value here. Also refer to README" description: "Always read description before changing a value here. Also refer to README"
@@ -186,6 +159,26 @@ questions:
type: string type: string
default: "ignore" default: "ignore"
required: true 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 # Enable Host Networking
- variable: hostNetwork - variable: hostNetwork
group: "Networking" group: "Networking"
+9 -6
View File
@@ -22,20 +22,23 @@ service:
# All values here are set as the docker defaults. # All values here are set as the docker defaults.
envTpl: envTpl:
# Permissions Settings # Permissions Settings
USER_ID: "568" USER_ID: "{{ .Values.env.PUID }}"
GROUP_ID: "568" GROUP_ID: "{{ .Values.env.PGID }}"
env: env:
# General Settings # Permissions Settings
PUID: "0"
PGID: "0"
# General Settings
KEEP_APP_RUNNING: "0" KEEP_APP_RUNNING: "0"
CLEAN_TMP_DIR: "1" CLEAN_TMP_DIR: "1"
# GUI Settings # GUI Settings
DISPLAY_WIDTH: "1280" DISPLAY_WIDTH: "1280"
DISPLAY_HEIGHT: "768" DISPLAY_HEIGHT: "768"
SECURE_CONNECTION: "0" SECURE_CONNECTION: "0"
VNC_PASSWORD: VNC_PASSWORD:
# Automated Conversion Preset # Automated Conversion Preset
AUTOMATED_CONVERSION_PRESET: "General/Very Fast 1080p30" AUTOMATED_CONVERSION_PRESET: "General/Very Fast 1080p30"
AUTOMATED_CONVERSION_FORMAT: "mp4" AUTOMATED_CONVERSION_FORMAT: "mp4"
AUTOMATED_CONVERSION_KEEP_SOURCE: "1" AUTOMATED_CONVERSION_KEEP_SOURCE: "1"
@@ -9,6 +9,7 @@ image:
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
tag: 10.7.5 tag: 10.7.5
# 44=video 107=render
podSecurityContext: podSecurityContext:
runAsNonRoot: true runAsNonRoot: true
runAsUser: 568 runAsUser: 568
@@ -360,18 +360,6 @@ questions:
schema: schema:
type: int type: int
default: 568 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 - variable: fsGroup
label: "fsGroup" label: "fsGroup"
description: "The group that should own ALL storage." description: "The group that should own ALL storage."
+1
View File
@@ -8,6 +8,7 @@ image:
strategy: strategy:
type: Recreate type: Recreate
# 44=video 107=render
podSecurityContext: podSecurityContext:
runAsNonRoot: true runAsNonRoot: true
runAsUser: 568 runAsUser: 568
+1
View File
@@ -9,6 +9,7 @@ image:
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
tag: v1.22.1.4228-724c56e62 tag: v1.22.1.4228-724c56e62
# 44=video 107=render
podSecurityContext: podSecurityContext:
runAsNonRoot: true runAsNonRoot: true
runAsUser: 568 runAsUser: 568
-12
View File
@@ -378,18 +378,6 @@ questions:
schema: schema:
type: int type: int
default: 568 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 - variable: fsGroup
label: "fsGroup" label: "fsGroup"
description: "The group that should own ALL storage." description: "The group that should own ALL storage."
+1
View File
@@ -8,6 +8,7 @@ image:
strategy: strategy:
type: Recreate type: Recreate
# 44=video 107=render
podSecurityContext: podSecurityContext:
runAsNonRoot: true runAsNonRoot: true
runAsUser: 568 runAsUser: 568
@@ -9,6 +9,7 @@ image:
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
tag: 2.4.1 tag: 2.4.1
# 5=tty 20=dialout 24=cdrom
podSecurityContext: podSecurityContext:
runAsNonRoot: true runAsNonRoot: true
runAsUser: 568 runAsUser: 568
@@ -473,18 +473,6 @@ questions:
schema: schema:
type: int type: int
default: 568 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 - variable: fsGroup
label: "fsGroup" label: "fsGroup"
description: "The group that should own ALL storage." description: "The group that should own ALL storage."
+1
View File
@@ -10,6 +10,7 @@ image:
strategy: strategy:
type: Recreate type: Recreate
# 5=tty 20=dialout 24=cdrom
podSecurityContext: podSecurityContext:
runAsNonRoot: true runAsNonRoot: true
runAsUser: 568 runAsUser: 568