Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump lib to 1.1.5 #763

Merged
merged 1 commit into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions ix-dev/community/actual-budget/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ icon: https://media.sys.truenas.net/apps/actual-budget/icons/icon.png
keywords:
- finance
- budget
lib_version: 1.1.4
lib_version_hash: 6e32ff5969906d9c3a10fea2b17fdd3197afb052d3432344da03188d8a907113
lib_version: 1.1.5
lib_version_hash: 51332f2b032a0c473693458cd93daa96d56604241878e538c07cb85b8be66727
maintainers:
- email: [email protected]
name: truenas
Expand All @@ -33,4 +33,4 @@ sources:
- https://hub.docker.com/r/actualbudget/actual-server
title: Actual Budget
train: community
version: 1.1.13
version: 1.1.14
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
6 changes: 3 additions & 3 deletions ix-dev/community/adguard-home/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ icon: https://media.sys.truenas.net/apps/adguard-home/icons/icon.svg
keywords:
- dns
- adblock
lib_version: 1.1.4
lib_version_hash: 6e32ff5969906d9c3a10fea2b17fdd3197afb052d3432344da03188d8a907113
lib_version: 1.1.5
lib_version_hash: 51332f2b032a0c473693458cd93daa96d56604241878e538c07cb85b8be66727
maintainers:
- email: [email protected]
name: truenas
Expand All @@ -40,4 +40,4 @@ sources:
- https://hub.docker.com/r/adguard/adguardhome
title: AdGuard Home
train: community
version: 1.0.22
version: 1.0.23
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
6 changes: 3 additions & 3 deletions ix-dev/community/audiobookshelf/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ icon: https://media.sys.truenas.net/apps/audiobookshelf/icons/icon.svg
keywords:
- media
- audiobook
lib_version: 1.1.4
lib_version_hash: 6e32ff5969906d9c3a10fea2b17fdd3197afb052d3432344da03188d8a907113
lib_version: 1.1.5
lib_version_hash: 51332f2b032a0c473693458cd93daa96d56604241878e538c07cb85b8be66727
maintainers:
- email: [email protected]
name: truenas
Expand All @@ -33,4 +33,4 @@ sources:
- https://github.com/advplyr/audiobookshelf
title: Audiobookshelf
train: community
version: 1.2.17
version: 1.2.18
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
6 changes: 3 additions & 3 deletions ix-dev/community/autobrr/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ keywords:
- media
- torrent
- usenet
lib_version: 1.1.4
lib_version_hash: 6e32ff5969906d9c3a10fea2b17fdd3197afb052d3432344da03188d8a907113
lib_version: 1.1.5
lib_version_hash: 51332f2b032a0c473693458cd93daa96d56604241878e538c07cb85b8be66727
maintainers:
- email: [email protected]
name: truenas
Expand All @@ -31,4 +31,4 @@ sources:
- https://github.com/autobrr/autobrr
title: Autobrr
train: community
version: 1.1.15
version: 1.1.16
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
6 changes: 3 additions & 3 deletions ix-dev/community/bazarr/app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ icon: https://media.sys.truenas.net/apps/bazarr/icons/icon.png
keywords:
- media
- subtitles
lib_version: 1.1.4
lib_version_hash: 6e32ff5969906d9c3a10fea2b17fdd3197afb052d3432344da03188d8a907113
lib_version: 1.1.5
lib_version_hash: 51332f2b032a0c473693458cd93daa96d56604241878e538c07cb85b8be66727
maintainers:
- email: [email protected]
name: truenas
Expand All @@ -31,4 +31,4 @@ sources:
- https://github.com/morpheus65535/bazarr
title: Bazarr
train: community
version: 1.0.22
version: 1.0.23
135 changes: 0 additions & 135 deletions ix-dev/community/bazarr/templates/library/base_v1_1_4/utils.py

This file was deleted.

Loading
Loading