organizr: use v2 (#1063)

truenas · WillKirkmanM · Nov 11, 2024 · Nov 11, 2024 · Nov 11, 2024 · Nov 11, 2024
commit bc5045792f9dbee77994c222b91a2a91f62d849d
diff --git a/ix-dev/community/organizr/app.yaml b/ix-dev/community/organizr/app.yaml
@@ -19,8 +19,8 @@ icon: https://media.sys.truenas.net/apps/organizr/icons/icon.png
 keywords:
 - dashboard
 - organizr
-lib_version: 1.1.7
-lib_version_hash: d05e43e25b7dc1736be6cc1efa4b9255368aa346e3e7a4350a38440f29b73186
+lib_version: 2.0.29
+lib_version_hash: 3c2dd83143491fdfc23e5e13de9db0aa79bb7846a2b7c32a76a479e334c54590
 maintainers:
 - email: [email protected]
   name: truenas
@@ -40,4 +40,4 @@ sources:
 - https://github.com/causefx/Organizr
 title: Organizr
 train: community
-version: 1.0.21
+version: 1.1.0
diff --git a/ix-dev/community/organizr/ix_values.yaml b/ix-dev/community/organizr/ix_values.yaml
@@ -5,3 +5,4 @@ images:
 
 consts:
   organizr_container_name: organizr
+  internal_web_port: 80
diff --git a/ix-dev/community/organizr/questions.yaml b/ix-dev/community/organizr/questions.yaml
@@ -7,6 +7,8 @@ groups:
     description: Configure Network for Organizr
   - name: Storage Configuration
     description: Configure Storage for Organizr
+  - name: Labels Configuration
+    description: Configure labels for Organizr
   - name: Resources Configuration
     description: Configure Resources for Organizr
 
@@ -307,6 +309,43 @@ 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: organizr
+                            description: organizr
+
   - variable: resources
     label: ""
     group: Resources Configuration

diff --git a/ix-dev/community/organizr/templates/docker-compose.yaml b/ix-dev/community/organizr/templates/docker-compose.yaml
@@ -1,49 +1,21 @@
-{# Stores storage items that contains info for volumes, vol mounts, perms dirs and perms mounts #}
-{% set storage_items = namespace(items=[]) %}
-{# Stores the top level volumes #}
-{% set volumes = namespace(items={}) %}
-{# Stores the container volume mounts #}
-{% set volume_mounts = namespace(items=[]) %}
+{% set tpl = ix_lib.base.render.Render(values) %}
 
-{% do storage_items.items.append(ix_lib.base.storage.storage_item(data=dict(values.storage.config, **{"mount_path": "/config"}), values=values)) %}
-{% do storage_items.items.append(ix_lib.base.storage.storage_item(data={"type":"anonymous", "mount_path": "/tmp"})) %}
-{% do storage_items.items.append(ix_lib.base.storage.storage_item(data={"type":"anonymous", "mount_path": "/var/run"})) %}
+{% set c1 = tpl.add_container(values.consts.organizr_container_name, "image") %}
+{% do c1.add_caps(["CHOWN", "FOWNER", "DAC_OVERRIDE", "SETGID", "SETUID"]) %}
+{% do c1.healthcheck.set_test("wget", {"port": values.consts.internal_web_port, "path": "/api/v2/ping"}) %}
 
-{% for store in values.storage.additional_storage %}
-  {% do storage_items.items.append(ix_lib.base.storage.storage_item(data=store, values=values)) %}
-{% endfor %}
+{% do c1.environment.add_user_envs(values.organizr.additional_envs) %}
 
-{# Add each item to the above lists #}
-{% for item in storage_items.items %}
-  {% if item.vol and volumes.items.update(item.vol) %}{% endif %}
-  {% if item.vol_mount and volume_mounts.items.append(item.vol_mount) %}{% endif %}
-{% endfor %}
+{% if not values.network.host_network %}
+  {% do c1.ports.add_port(values.network.web_port, values.consts.internal_web_port) %}
+{% endif %}
 
-{# Containers #}
-services:
-  {{ values.consts.organizr_container_name }}:
-    image: {{ ix_lib.base.utils.get_image(images=values.images, name="image") }}
-    restart: unless-stopped
-    deploy:
-      resources: {{ ix_lib.base.resources.resources(values.resources) | tojson }}
-    devices: {{ ix_lib.base.resources.get_devices(values.resources) | tojson }}
-    {% set caps = ix_lib.base.security.get_caps(add=["CHOWN", "FOWNER", "DAC_OVERRIDE", "SETGID", "SETUID"]) %}
-    cap_add: {{ caps.add | tojson }}
-    cap_drop: {{ caps.drop | tojson }}
-    security_opt: {{ ix_lib.base.security.get_sec_opts() | tojson }}
-    {% if values.network.dns_opts %}
-    dns_opt: {{ ix_lib.base.network.dns_opts(values.network.dns_opts) | tojson }}
-    {% endif %}
-    {% set test = ix_lib.base.healthchecks.wget_test(port=80, path="/api/v2/ping") %}
-    healthcheck: {{ ix_lib.base.healthchecks.check_health(test) | tojson }}
-    environment: {{ ix_lib.base.environment.envs(app={}, user=values.organizr.additional_envs, values=values) | tojson }}
-    ports:
-      - {{ ix_lib.base.ports.get_port(port={"target": 80, "published": values.network.web_port}) | tojson }}
-    volumes: {{ volume_mounts.items | tojson }}
+{% do c1.add_storage("/var/run", {"type": "anonymous"}) %}
+{% do c1.add_storage("/config", values.storage.config) %}
+{% for store in values.storage.additional_storage %}
+  {% do c1.add_storage(store.mount_path, store) %}
+{% endfor %}
 
-{% if volumes.items %}
-volumes: {{ volumes.items | tojson }}
-{% endif %}
+{% do tpl.portals.add_portal({"port": values.consts.internal_web_port if values.network.host_network else values.network.web_port}) %}
 
-x-portals: {{ ix_lib.base.metadata.get_portals([{"port": values.network.web_port}]) | tojson }}
-x-notes: {{ ix_lib.base.metadata.get_notes("Organizr") | tojson }}
+{{ tpl.render() | tojson }}
diff --git a/ix-dev/community/organizr/templates/library/base_v1_1_7/environment.py b/ix-dev/community/organizr/templates/library/base_v1_1_7/environment.py
diff --git a/ix-dev/community/organizr/templates/library/base_v1_1_7/healthchecks.py b/ix-dev/community/organizr/templates/library/base_v1_1_7/healthchecks.py
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@ images:

		consts:
		organizr_container_name: organizr
		internal_web_port: 80