chore(deps): update updates-patch-minor (#1536)

* chore(deps): update updates-patch-minor

* ff3 runs rootless now

---------

Co-authored-by: bugclerk <bugclerk@ixsystems.com>
Co-authored-by: Stavros Kois <s.kois@outlook.com>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>

ix-dev/community/firefly-iii/app.yaml

@@ -1,4 +1,4 @@
-app_version: version-6.1.25
+app_version: version-6.2.2
 capabilities:
 - description: Firefly III and Firefly Data Importer is able to chown files.
   name: CHOWN
@@ -57,4 +57,4 @@ sources:
 - https://github.com/firefly-iii/firefly-iii
 title: Firefly III
 train: community
-version: 1.4.12
+version: 1.5.0

ix-dev/community/firefly-iii/ix_values.yaml

@@ -1,10 +1,10 @@
 images:
   image:
     repository: fireflyiii/core
-    tag: version-6.1.25
+    tag: version-6.2.2
   importer_image:
     repository: fireflyiii/data-importer
-    tag: version-1.5.7
+    tag: version-1.6.0
   postgres_15_image:
     repository: postgres
     tag: "15.10"
@@ -27,3 +27,5 @@ consts:
   redis_container_name: redis
   db_user: firefly
   db_name: firefly
+  run_as_user: 33
+  run_as_group: 33

ix-dev/community/firefly-iii/templates/docker-compose.yaml

@@ -1,6 +1,7 @@
 {% set tpl = ix_lib.base.render.Render(values) %}
 
 {% set perm_container = tpl.deps.perms(values.consts.perms_container_name) %}
+{% set perms_config = {"uid": values.consts.run_as_user, "gid": values.consts.run_as_group, "mode": "check"} %}
 
 {% set pg_config = {
   "user": values.consts.db_user,
@@ -27,11 +28,10 @@
 {% set cron = tpl.add_container(values.consts.firefly_iii_cron_container_name, "alpine_image") %}
 {% set importer = namespace(x=None) %}
 
-{% do c1.set_user(0, 0) %}
-{% do c1.add_caps(["CHOWN", "FOWNER", "SETUID", "SETGID"]) %}
+{% do c1.set_user(values.consts.run_as_user, values.consts.run_as_group) %}
 {% do c1.depends.add_dependency(values.consts.postgres_container_name, "service_healthy") %}
 {% do c1.depends.add_dependency(values.consts.redis_container_name, "service_healthy") %}
-{% do c1.healthcheck.set_test("curl", {"port": 8080, "path": "/health"}) %}
+{% do c1.healthcheck.set_test("curl", {"port": 8080, "path": "/healthcheck"}) %}
 
 {% do c1.ports.add_port(values.network.web_port, 8080) %}
 
@@ -55,8 +55,10 @@
 {% do c1.environment.add_user_envs(values.firefly_iii.additional_envs) %}
 
 {% do c1.add_storage("/var/www/html/storage/upload", values.storage.uploads) %}
+{% do perm_container.add_or_skip_action("upload", values.storage.uploads, perms_config) %}
 {% for store in values.storage.additional_storage %}
   {% do c1.add_storage(store.mount_path, store) %}
+  {% do perm_container.add_or_skip_action(store.mount_path, store, perms_config) %}
 {% endfor %}
 
 {% do cron.deploy.resources.set_profile("low") %}
@@ -75,10 +77,10 @@
 {% if values.firefly_iii.enable_importer %}
   {% set importer.x = tpl.add_container(values.consts.firefly_iii_importer_container_name, "importer_image") %}
 
-  {% do importer.x.set_user(0, 0) %}
+  {% do importer.x.set_user(values.consts.run_as_user, values.consts.run_as_group) %}
   {% do importer.x.add_caps(["CHOWN", "FOWNER", "SETUID", "SETGID"]) %}
   {% do importer.x.depends.add_dependency(values.consts.firefly_iii_container_name, "service_healthy") %}
-  {% do importer.x.healthcheck.set_test("curl", {"port": 8080, "path": "/health"}) %}
+  {% do importer.x.healthcheck.set_test("curl", {"port": 8080, "path": "/healthcheck"}) %}
 
   {% do importer.x.environment.add_env("FIREFLY_III_URL", "http://%s:8080"|format(values.consts.firefly_iii_container_name)) %}
   {% do importer.x.environment.add_env("EXPECT_SECURE_URL", false) %}