Skip to content

Commit

Permalink
Merge branch 'add-urls-for-deps' into update-apps-v2-lib
Browse files Browse the repository at this point in the history
  • Loading branch information
stavros-k authored Oct 31, 2024
2 parents 89d0bfb + eec95a1 commit 3c0fb89
Show file tree
Hide file tree
Showing 265 changed files with 382 additions and 329 deletions.
281 changes: 151 additions & 130 deletions catalog.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ix-dev/community/filebrowser/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ sources:
- https://hub.docker.com/r/filebrowser/filebrowser
title: File Browser
train: community
version: 1.1.11
version: 1.1.12
4 changes: 2 additions & 2 deletions ix-dev/community/filebrowser/questions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ questions:
description: The user id that File Browser files will be owned by.
schema:
type: int
min: 568
min: 0
default: 568
required: true
- variable: group
label: Group ID
description: The group id that File Browser files will be owned by.
schema:
type: int
min: 568
min: 0
default: 568
required: true

Expand Down
22 changes: 16 additions & 6 deletions ix-dev/community/listmonk/app.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
app_version: v3.0.0
capabilities: []
app_version: v4.0.1
capabilities:
- description: Listmonk is able to chown files.
name: CHOWN
- description: Listmonk is able to bypass permission checks.
name: DAC_OVERRIDE
- description: Listmonk is able bypass permission checks for it's sub-processes.
name: FOWNER
- description: Listmonk is able to set group ID for it's sub-processes.
name: SETGID
- description: Listmonk is able to set user ID for it's sub-processes.
name: SETUID
categories:
- productivity
description: Listmonk is a self-hosted newsletter and mailing list manager.
Expand All @@ -17,10 +27,10 @@ maintainers:
url: https://www.truenas.com/
name: listmonk
run_as_context:
- description: Listmonk runs as any non-root user.
gid: 568
- description: Listmonk runs as root user.
gid: 0
group_name: listmonk
uid: 568
uid: 0
user_name: listmonk
- description: Postgres runs as non-root user.
gid: 999
Expand All @@ -36,4 +46,4 @@ sources:
- https://github.com/knadh/listmonk
title: Listmonk
train: community
version: 1.0.9
version: 1.0.10
4 changes: 1 addition & 3 deletions ix-dev/community/listmonk/ix_values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
images:
image:
repository: listmonk/listmonk
tag: v3.0.0
tag: v4.0.1
postgres_image:
repository: postgres
tag: "15.8"
Expand All @@ -11,8 +11,6 @@ consts:
listmonk_container_name: listmonk
postgres_container_name: postgres
perms_container_name: permissions
run_as_user: 1000
run_as_group: 1000
db_name: listmonk
db_user: listmonk
pg_run_as_user: 999
Expand Down
13 changes: 8 additions & 5 deletions ix-dev/community/listmonk/templates/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@
{% endfor %}

{% do storage_items.items.append(ix_lib.base.storage.storage_item(data=dict(values.storage.uploads, **{"mount_path": "/listmonk/uploads"}),
values=values, perm_opts={"mount_path": "/mnt/listmonk/uploads", "mode": "check", "uid": values.consts.run_as_user, "gid": values.consts.run_as_group}
values=values, perm_opts={"mount_path": "/mnt/listmonk/uploads", "mode": "check", "uid": values.run_as.user, "gid": values.run_as.group}
)) %}

{% do storage_items.items.append(ix_lib.base.storage.storage_item(data={"type": "temporary", "mount_path": "/tmp"},
perm_opts={"mount_path": "/mnt/listmonk/tmp", "mode": "check", "uid": values.consts.run_as_user, "gid": values.consts.run_as_group}
perm_opts={"mount_path": "/mnt/listmonk/tmp", "mode": "check", "uid": values.run_as.user, "gid": values.run_as.group}
)) %}

{% for store in values.storage.additional_storage %}
{% do storage_items.items.append(ix_lib.base.storage.storage_item(data=store, values=values,
perm_opts={"mount_path": "/mnt/listmonk/dir_%s"|format(loop.index0), "mode": "check", "uid": values.consts.run_as_user, "gid": values.consts.run_as_group}
perm_opts={"mount_path": "/mnt/listmonk/dir_%s"|format(loop.index0), "mode": "check", "uid": values.run_as.user, "gid": values.run_as.group}
)) %}
{% endfor %}

Expand All @@ -60,6 +60,7 @@
services:
{{ values.consts.init_container_name }}:
image: {{ ix_lib.base.utils.get_image(images=values.images, name="image") }}
user: "0:0"
restart: on-failure
deploy:
resources: {{ ix_lib.base.resources.resources(values.resources) | tojson }}
Expand All @@ -85,7 +86,7 @@ services:
volumes: {{ volume_mounts.items | tojson }}

{{ values.consts.listmonk_container_name }}:
user: {{ "%d:%d" | format(values.consts.run_as_user, values.consts.run_as_group) }}
user: "0:0"
image: {{ ix_lib.base.utils.get_image(images=values.images, name="image") }}
restart: unless-stopped
deploy:
Expand All @@ -100,7 +101,9 @@ services:
{{ values.consts.perms_container_name }}:
condition: service_completed_successfully
{% endif %}
cap_drop: {{ ix_lib.base.security.get_caps().drop | tojson }}
{% set caps = ix_lib.base.security.get_caps(add=["CHOWN", "FOWNER", "DAC_OVERRIDE", "SETUID", "SETGID"]) %}
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 }}
Expand Down
2 changes: 1 addition & 1 deletion ix-dev/stable/nextcloud/templates/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
{% if values.nextcloud.host %}
{% do trusted_domains.x.append(
values.nextcloud.host if ":" in values.nextcloud.host
else "%s:%d"|format(values.nextcloud.host, values.nextcloud.port)
else "%s:%d"|format(values.nextcloud.host, values.network.web_port)
) %}
{% endif %}
{% do nc_env.x.append(("NEXTCLOUD_TRUSTED_DOMAINS", trusted_domains.x|unique|list|join(" "))) %}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,8 @@ def basic_auth_header(username, password):
return f"Basic {security.basic_auth(username, password)}"


def bcrypt_hash(password, escape=True):
hashed = bcrypt.hashpw(password.encode("utf-8"), bcrypt.gensalt()).decode("utf-8")
if escape:
# Docker compose will try to expand the value, so we need to escape it
return hashed.replace("$", "$$")
return hashed
def bcrypt_hash(password):
return bcrypt.hashpw(password.encode("utf-8"), bcrypt.gensalt()).decode("utf-8")


def match_regex(value, regex):
Expand Down Expand Up @@ -88,9 +84,7 @@ def get_image(images={}, name=""):
if name not in images:
throw_error(f"Expected [images.{name}] to be set")
if not images[name].get("repository") or not images[name].get("tag"):
throw_error(
f"Expected [images.{name}.repository] and [images.{name}.tag] to be set"
)
throw_error(f"Expected [images.{name}.repository] and [images.{name}.tag] to be set")

return f"{images[name]['repository']}:{images[name]['tag']}"

Expand All @@ -109,13 +103,8 @@ def copy_dict(dict):
return dict.copy()


# Replaces all single dollar signs with double dollar signs
# Docker tries to expand shell variables, so we need to
# escape them in multiple places
# It will not replace dollar signs that are already escaped
def escape_dollar(text):
# https://regex101.com/r/tdbI7y/1
return re.sub(r"(?<!\$)\$(?!\$)", r"$$", text)
def escape_dollar(text: str) -> str:
return text.replace("$", "$$")


def auto_cast(value):
Expand Down
2 changes: 1 addition & 1 deletion library/hashes.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
0.0.1: f074617a82a86d2a6cc78a4c8a4296fc9d168e456f12713e50c696557b302133
1.1.4: 6e32ff5969906d9c3a10fea2b17fdd3197afb052d3432344da03188d8a907113
1.1.5: 51332f2b032a0c473693458cd93daa96d56604241878e538c07cb85b8be66727
2.0.6: 39d6ab5b62befe6d2e1d80fe590291662ccd2b678f162ea13d305008fb695b66
2 changes: 1 addition & 1 deletion trains/community/actual-budget/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/actual-budget/1.1.13",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "24.10.1_1.1.13",
"version": "1.1.13",
Expand Down
2 changes: 1 addition & 1 deletion trains/community/adguard-home/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/adguard-home/1.0.22",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "v0.107.53_1.0.22",
"version": "1.0.22",
Expand Down
2 changes: 1 addition & 1 deletion trains/community/audiobookshelf/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/audiobookshelf/1.2.17",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "2.16.2_1.2.17",
"version": "1.2.17",
Expand Down
2 changes: 1 addition & 1 deletion trains/community/autobrr/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/autobrr/1.1.15",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "v1.48.0_1.1.15",
"version": "1.1.15",
Expand Down
2 changes: 1 addition & 1 deletion trains/community/bazarr/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/bazarr/1.0.22",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "1.4.5_1.0.22",
"version": "1.0.22",
Expand Down
2 changes: 1 addition & 1 deletion trains/community/briefkasten/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/briefkasten/1.0.19",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "latest_1.0.19",
"version": "1.0.19",
Expand Down
2 changes: 1 addition & 1 deletion trains/community/castopod/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/castopod/1.0.12",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "1.13.0_1.0.12",
"version": "1.0.12",
Expand Down
2 changes: 1 addition & 1 deletion trains/community/chia/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/chia/1.0.16",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "2.4.4_1.0.16",
"version": "1.0.16",
Expand Down
2 changes: 1 addition & 1 deletion trains/community/clamav/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/clamav/1.1.10",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "1.1.2-2_1.1.10",
"version": "1.1.10",
Expand Down
2 changes: 1 addition & 1 deletion trains/community/cloudflared/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/cloudflared/1.1.14",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "2024.10.1_1.1.14",
"version": "1.1.14",
Expand Down
2 changes: 1 addition & 1 deletion trains/community/dashy/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/dashy/1.0.18",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "3.1.0_1.0.18",
"version": "1.0.18",
Expand Down
2 changes: 1 addition & 1 deletion trains/community/ddns-updater/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/ddns-updater/1.0.24",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "v2.8.1_1.0.24",
"version": "1.0.24",
Expand Down
2 changes: 1 addition & 1 deletion trains/community/deluge/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/deluge/1.0.18",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "2.1.1_1.0.18",
"version": "1.0.18",
Expand Down
2 changes: 1 addition & 1 deletion trains/community/distribution/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/distribution/1.0.19",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "2.8.3_1.0.19",
"version": "1.0.19",
Expand Down
2 changes: 1 addition & 1 deletion trains/community/dockge/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/dockge/1.0.17",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "1.4.2_1.0.17",
"version": "1.0.17",
Expand Down
2 changes: 1 addition & 1 deletion trains/community/drawio/app_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/drawio/1.1.11",
"last_update": "2024-10-31 13:01:07",
"last_update": "2024-10-31 16:39:37",
"required_features": [],
"human_version": "24.7.17_1.1.11",
"version": "1.1.11",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ sources:
- https://hub.docker.com/r/filebrowser/filebrowser
title: File Browser
train: community
version: 1.1.11
version: 1.1.12
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ questions:
description: The user id that File Browser files will be owned by.
schema:
type: int
min: 568
min: 0
default: 568
required: true
- variable: group
label: Group ID
description: The group id that File Browser files will be owned by.
schema:
type: int
min: 568
min: 0
default: 568
required: true

Expand Down
File renamed without changes.
16 changes: 8 additions & 8 deletions trains/community/filebrowser/app_versions.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"1.1.11": {
"1.1.12": {
"healthy": true,
"supported": true,
"healthy_error": null,
"location": "/__w/apps/apps/trains/community/filebrowser/1.1.11",
"last_update": "2024-10-31 13:01:07",
"location": "/__w/apps/apps/trains/community/filebrowser/1.1.12",
"last_update": "2024-10-31 16:42:28",
"required_features": [],
"human_version": "v2.31.2_1.1.11",
"version": "1.1.11",
"human_version": "v2.31.2_1.1.12",
"version": "1.1.12",
"app_metadata": {
"app_version": "v2.31.2",
"capabilities": [],
Expand Down Expand Up @@ -53,7 +53,7 @@
],
"title": "File Browser",
"train": "community",
"version": "1.1.11"
"version": "1.1.12"
},
"schema": {
"groups": [
Expand Down Expand Up @@ -138,7 +138,7 @@
"description": "The user id that File Browser files will be owned by.",
"schema": {
"type": "int",
"min": 568,
"min": 0,
"default": 568,
"required": true
}
Expand All @@ -149,7 +149,7 @@
"description": "The group id that File Browser files will be owned by.",
"schema": {
"type": "int",
"min": 568,
"min": 0,
"default": 568,
"required": true
}
Expand Down
Loading

0 comments on commit 3c0fb89

Please sign in to comment.