Publish new changes in catalog [skip ci]

truenas · WillKirkmanM · Nov 11, 2024 · Nov 11, 2024 · Nov 11, 2024 · Nov 11, 2024
commit 15c922b1bce0eb7baf63cc5ad950183f76d10388
diff --git a/trains/community/castopod/1.0.16/templates/docker-compose.yaml b/trains/community/castopod/1.0.16/templates/docker-compose.yaml
diff --git a/trains/community/castopod/1.0.16/README.md → trains/community/castopod/1.1.0/README.md b/trains/community/castopod/1.0.16/README.md → trains/community/castopod/1.1.0/README.md
diff --git a/trains/community/castopod/1.0.16/app.yaml → trains/community/castopod/1.1.0/app.yaml b/trains/community/castopod/1.0.16/app.yaml → trains/community/castopod/1.1.0/app.yaml
@@ -19,8 +19,8 @@ host_mounts: []
 icon: https://media.sys.truenas.net/apps/castopod/icons/icon.svg
 keywords:
 - podcast
-lib_version: 1.1.7
-lib_version_hash: d05e43e25b7dc1736be6cc1efa4b9255368aa346e3e7a4350a38440f29b73186
+lib_version: 2.0.29
+lib_version_hash: 3c2dd83143491fdfc23e5e13de9db0aa79bb7846a2b7c32a76a479e334c54590
 maintainers:
 - email: [email protected]
   name: truenas
@@ -49,4 +49,4 @@ sources:
 - https://code.castopod.org/adaures/castopod
 title: Castopod
 train: community
-version: 1.0.16
+version: 1.1.0
diff --git a/.../community/castopod/1.0.16/ix_values.yaml → ...s/community/castopod/1.1.0/ix_values.yaml b/.../community/castopod/1.0.16/ix_values.yaml → ...s/community/castopod/1.1.0/ix_values.yaml
@@ -14,7 +14,7 @@ images:
 
 consts:
   castopod_container_name: castopod
-  castopod_web_container_name: web
+  castopod_web_container_name: castopod-web
   perms_container_name: permissions
   mariadb_container_name: mariadb
   redis_container_name: redis

diff --git a/...1.0.16/migrations/migrate_from_kubernetes → .../1.1.0/migrations/migrate_from_kubernetes b/...1.0.16/migrations/migrate_from_kubernetes → .../1.1.0/migrations/migrate_from_kubernetes
diff --git a/.../migrations/migration_helpers/__init__.py → .../migrations/migration_helpers/__init__.py b/.../migrations/migration_helpers/__init__.py → .../migrations/migration_helpers/__init__.py
diff --git a/....0.16/migrations/migration_helpers/cpu.py → ...1.1.0/migrations/migration_helpers/cpu.py b/....0.16/migrations/migration_helpers/cpu.py → ...1.1.0/migrations/migration_helpers/cpu.py
diff --git a/...igrations/migration_helpers/dns_config.py → ...igrations/migration_helpers/dns_config.py b/...igrations/migration_helpers/dns_config.py → ...igrations/migration_helpers/dns_config.py
diff --git a/...s/migration_helpers/kubernetes_secrets.py → ...s/migration_helpers/kubernetes_secrets.py b/...s/migration_helpers/kubernetes_secrets.py → ...s/migration_helpers/kubernetes_secrets.py
diff --git a/...16/migrations/migration_helpers/memory.py → ....0/migrations/migration_helpers/memory.py b/...16/migrations/migration_helpers/memory.py → ....0/migrations/migration_helpers/memory.py
diff --git a/...migrations/migration_helpers/resources.py → ...migrations/migration_helpers/resources.py b/...migrations/migration_helpers/resources.py → ...migrations/migration_helpers/resources.py
diff --git a/...6/migrations/migration_helpers/storage.py → ...0/migrations/migration_helpers/storage.py b/...6/migrations/migration_helpers/storage.py → ...0/migrations/migration_helpers/storage.py
diff --git a/.../community/castopod/1.0.16/questions.yaml → ...s/community/castopod/1.1.0/questions.yaml b/.../community/castopod/1.0.16/questions.yaml → ...s/community/castopod/1.1.0/questions.yaml
@@ -5,6 +5,8 @@ groups:
     description: Configure Network for Castopod
   - name: Storage Configuration
     description: Configure Storage for Castopod
+  - name: Labels Configuration
+    description: Configure labels for Castopod
   - name: Resources Configuration
     description: Configure Resources for Castopod
 
@@ -432,6 +434,49 @@ questions:
                             description: The domain to use for the SMB share.
                             schema:
                               type: string
+  - variable: labels
+    label: ""
+    group: Labels Configuration
+    schema:
+      type: list
+      default: []
+      items:
+        - variable: label
+          label: Label
+          schema:
+            type: dict
+            attrs:
+              - variable: key
+                label: Key
+                schema:
+                  type: string
+                  required: true
+              - variable: value
+                label: Value
+                schema:
+                  type: string
+                  required: true
+              - variable: containers
+                label: Containers
+                description: Containers where the label should be applied
+                schema:
+                  type: list
+                  items:
+                    - variable: container
+                      label: Container
+                      schema:
+                        type: string
+                        required: true
+                        enum:
+                          - value: castopod
+                            description: castopod
+                          - value: castopod-web
+                            description: castopod-web
+                          - value: mariadb
+                            description: mariadb
+                          - value: redis
+                            description: redis
+
   - variable: resources
     label: ""
     group: Resources Configuration

diff --git a/trains/community/castopod/1.1.0/templates/docker-compose.yaml b/trains/community/castopod/1.1.0/templates/docker-compose.yaml
@@ -0,0 +1,76 @@
+{% set tpl = ix_lib.base.render.Render(values) %}
+
+{% set perm_container = tpl.deps.perms(values.consts.perms_container_name) %}
+{% set mariadb_config = {
+  "user": values.consts.db_user,
+  "root_password": values.castopod.db_root_password,
+  "password": values.castopod.db_password,
+  "database": values.consts.db_name,
+  "volume": values.storage.mariadb_data,
+} %}
+{% set mariadb_container = tpl.deps.mariadb(values.consts.mariadb_container_name, "mariadb_image", mariadb_config, perm_container) %}
+
+{% set redis_config = {
+  "password": values.castopod.redis_password,
+  "volume": {"type": "temporary", "volume_config": {"volume_name": "redis-data"}},
+} %}
+{% set redis_container = tpl.deps.redis(values.consts.redis_container_name, "redis_image", redis_config, perm_container) %}
+
+{% set c1 = tpl.add_container(values.consts.castopod_container_name, "image") %}
+{% do c1.set_user(0, 0) %}
+{% do c1.add_caps(["CHOWN", "DAC_OVERRIDE", "FOWNER", "SETGID", "SETUID"]) %}
+{% do c1.depends.add_dependency(values.consts.mariadb_container_name, "service_healthy") %}
+{% do c1.depends.add_dependency(values.consts.redis_container_name, "service_healthy") %}
+{% do c1.healthcheck.set_test("tcp", {"port": values.consts.internal_api_port}) %}
+{% do c1.environment.add_env("CP_ANALYTICS_SALT", values.castopod.analytics_salt) %}
+{% do c1.environment.add_env("CP_DATABASE_HOSTNAME", values.consts.mariadb_container_name) %}
+{% do c1.environment.add_env("CP_DATABASE_NAME", values.consts.db_name) %}
+{% do c1.environment.add_env("CP_DATABASE_USERNAME", values.consts.db_user) %}
+{% do c1.environment.add_env("CP_DATABASE_PASSWORD", values.castopod.db_password) %}
+{% do c1.environment.add_env("CP_CACHE_HANDLER", "redis") %}
+{% do c1.environment.add_env("CP_REDIS_HOST", values.consts.redis_container_name) %}
+{% do c1.environment.add_env("CP_REDIS_PASSWORD", values.castopod.redis_password) %}
+{% do c1.environment.add_env("CP_REDIS_PORT", 6379) %}
+{% do c1.environment.add_env("CP_REDIS_DATABASE", 0) %}
+{% do c1.environment.add_env("CP_TIMEOUT", values.castopod.web_timeout) %}
+{% do c1.environment.add_env("CP_MAX_BODY_SIZE", "%dM" | format(values.castopod.web_max_body_size)) %}
+{% do c1.environment.add_env("CP_PHP_MEMORY_LIMIT", "%dM" | format(values.castopod.php_memory_limit)) %}
+{% do c1.environment.add_env("CP_BASEURL", values.castopod.base_url) %}
+{% do c1.environment.add_env("CP_MEDIAURL", values.castopod.base_url) %}
+{% do c1.environment.add_env("CP_ENABLE_2FA", values.castopod.enable_2fa) %}
+{% do c1.environment.add_env("CP_DISABLE_HTTPS", 1 if values.castopod.disable_https_redirect else 0) %}
+{% do c1.environment.add_user_envs(values.castopod.additional_envs) %}
+
+{% set web = tpl.add_container(values.consts.castopod_web_container_name, "web_image") %}
+{% do web.set_user(0, 0) %}
+{% do web.add_caps(["CHOWN", "SETGID", "SETUID"]) %}
+{% do web.depends.add_dependency(values.consts.castopod_container_name, "service_healthy") %}
+{% do web.healthcheck.set_test("curl", {"port": values.consts.internal_web_port, "path": "/health"}) %}
+{% do web.environment.add_env("CP_TIMEOUT", values.castopod.web_timeout) %}
+{% do web.environment.add_env("CP_APP_HOSTNAME", values.consts.castopod_container_name) %}
+{% do web.environment.add_env("CP_MAX_BODY_SIZE", "%dM" | format(values.castopod.web_max_body_size)) %}
+{% do web.environment.add_user_envs(values.castopod.additional_envs) %}
+{% do web.ports.add_port(values.network.web_port, values.consts.internal_web_port) %}
+
+{% do c1.add_storage("/var/www/castopod/public/media", values.storage.data) %}
+{% do web.add_storage("/var/www/html/media", values.storage.data) %}
+{% for store in values.storage.additional_storage %}
+  {% do c1.add_storage(store.mount_path, store) %}
+  {% do web.add_storage(store.mount_path, store) %}
+{% endfor %}
+
+{% if perm_container.has_actions() %}
+  {% do perm_container.activate() %}
+  {% do mariadb_container.container.depends.add_dependency(values.consts.perms_container_name, "service_completed_successfully") %}
+  {% do redis_container.container.depends.add_dependency(values.consts.perms_container_name, "service_completed_successfully") %}
+{% endif %}
+
+{% do tpl.portals.add_portal({"port": values.network.web_port}) %}
+{% set is_install = values.get("ix_context", {}).get("is_install", False) %}
+{% do tpl.portals.add_portal({
+  "port": values.network.web_port,
+  "name": "Install Portal" if is_install else "Admin Portal",
+  "path": "/cp-install" if is_install else "/cp-admin"
+}) %}
+
+{{ tpl.render() | tojson }}
diff --git a/...templates/library/base_v1_1_7/__init__.py → ...templates/library/base_v1_1_7/__init__.py b/...templates/library/base_v1_1_7/__init__.py → ...templates/library/base_v1_1_7/__init__.py
diff --git a/...plates/library/base_v1_1_7/environment.py → ...plates/library/base_v1_1_7/environment.py b/...plates/library/base_v1_1_7/environment.py → ...plates/library/base_v1_1_7/environment.py
diff --git a/...lates/library/base_v1_1_7/healthchecks.py → ...lates/library/base_v1_1_7/healthchecks.py b/...lates/library/base_v1_1_7/healthchecks.py → ...lates/library/base_v1_1_7/healthchecks.py
diff --git a/.../templates/library/base_v1_1_7/mariadb.py → .../templates/library/base_v1_1_7/mariadb.py b/.../templates/library/base_v1_1_7/mariadb.py → .../templates/library/base_v1_1_7/mariadb.py
diff --git a/...templates/library/base_v1_1_7/metadata.py → ...templates/library/base_v1_1_7/metadata.py b/...templates/library/base_v1_1_7/metadata.py → ...templates/library/base_v1_1_7/metadata.py
diff --git a/.../templates/library/base_v1_1_7/network.py → .../templates/library/base_v1_1_7/network.py b/.../templates/library/base_v1_1_7/network.py → .../templates/library/base_v1_1_7/network.py
diff --git a/...plates/library/base_v1_1_7/permissions.py → ...plates/library/base_v1_1_7/permissions.py b/...plates/library/base_v1_1_7/permissions.py → ...plates/library/base_v1_1_7/permissions.py
diff --git a/...16/templates/library/base_v1_1_7/ports.py → ....0/templates/library/base_v1_1_7/ports.py b/...16/templates/library/base_v1_1_7/ports.py → ....0/templates/library/base_v1_1_7/ports.py
diff --git a/...templates/library/base_v1_1_7/postgres.py → ...templates/library/base_v1_1_7/postgres.py b/...templates/library/base_v1_1_7/postgres.py → ...templates/library/base_v1_1_7/postgres.py
diff --git a/...16/templates/library/base_v1_1_7/redis.py → ....0/templates/library/base_v1_1_7/redis.py b/...16/templates/library/base_v1_1_7/redis.py → ....0/templates/library/base_v1_1_7/redis.py
diff --git a/...emplates/library/base_v1_1_7/resources.py → ...emplates/library/base_v1_1_7/resources.py b/...emplates/library/base_v1_1_7/resources.py → ...emplates/library/base_v1_1_7/resources.py
diff --git a/...templates/library/base_v1_1_7/security.py → ...templates/library/base_v1_1_7/security.py b/...templates/library/base_v1_1_7/security.py → ...templates/library/base_v1_1_7/security.py
diff --git a/.../templates/library/base_v1_1_7/storage.py → .../templates/library/base_v1_1_7/storage.py b/.../templates/library/base_v1_1_7/storage.py → .../templates/library/base_v1_1_7/storage.py
diff --git a/...16/templates/library/base_v1_1_7/utils.py → ....0/templates/library/base_v1_1_7/utils.py b/...16/templates/library/base_v1_1_7/utils.py → ....0/templates/library/base_v1_1_7/utils.py
diff --git a/.../migrations/migration_helpers/__init__.py → ...emplates/library/base_v2_0_29/__init__.py b/.../migrations/migration_helpers/__init__.py → ...emplates/library/base_v2_0_29/__init__.py