.woodpecker/build-container.yml

@@ -13,7 +13,7 @@ steps:
       - poetry build
 
   - name: dryrun
-    image: quay.io/thegeeklab/wp-docker-buildx:4
+    image: quay.io/thegeeklab/wp-docker-buildx:2
     settings:
       containerfile: Containerfile.multiarch
       dry_run: true
@@ -26,7 +26,7 @@ steps:
       - event: [pull_request]
 
   - name: publish-dockerhub
-    image: quay.io/thegeeklab/wp-docker-buildx:4
+    image: quay.io/thegeeklab/wp-docker-buildx:2
     group: container
     settings:
       auto_tag: true
@@ -47,7 +47,7 @@ steps:
           - ${CI_REPO_DEFAULT_BRANCH}
 
   - name: publish-quay
-    image: quay.io/thegeeklab/wp-docker-buildx:4
+    image: quay.io/thegeeklab/wp-docker-buildx:2
     group: container
     settings:
       auto_tag: true

.woodpecker/docs.yml

@@ -32,7 +32,7 @@ steps:
       - lychee --no-progress --format detailed docs/content README.md
 
   - name: build
-    image: quay.io/thegeeklab/hugo:0.127.0
+    image: quay.io/thegeeklab/hugo:0.121.2
     commands:
       - hugo --panicOnWarning -s docs/
 

.woodpecker/lint.yml

@@ -20,6 +20,6 @@ steps:
     commands:
       - pip install poetry poetry-dynamic-versioning -qq
       - poetry install
-      - poetry run ruff check ./${CI_REPO_NAME//-/}
+      - poetry run ruff ./${CI_REPO_NAME//-/}
     environment:
       PY_COLORS: "1"

Containerfile.multiarch

@@ -1,4 +1,4 @@
-FROM python:3.12-alpine@sha256:dc095966439c68283a01dde5e5bc9819ba24b28037dddd64ea224bf7aafc0c82
+FROM python:3.12-alpine@sha256:c793b92fd9e0e2a0b611756788a033d569ca864b733461c8fb30cfd14847dbcf
 
 LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
 LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"

Makefile

@@ -1,5 +1,5 @@
 # renovate: datasource=github-releases depName=thegeeklab/hugo-geekdoc
-THEME_VERSION := v0.46.0
+THEME_VERSION := v0.44.0
 THEME := hugo-geekdoc
 BASEDIR := docs
 THEMEDIR := $(BASEDIR)/themes

dockertidy/config.py

@@ -234,8 +234,11 @@ class Config:
         try:
             anyconfig.validate(config, self.schema, ac_schema_safe=False)
         except jsonschema.exceptions.ValidationError as e:
-            schema = format_as_index(list(e.relative_schema_path)[:-1])
-            schema_error = f"Failed validating '{e.validator}' in schema {schema}\n{e.message}"
+            schema_error = "Failed validating '{validator}' in schema{schema}\n{message}".format(
+                validator=e.validator,
+                schema=format_as_index(list(e.relative_schema_path)[:-1]),
+                message=e.message,
+            )
             raise dockertidy.exception.ConfigError("Configuration error", schema_error) from e
 
         return True
@@ -245,7 +248,7 @@ class Config:
         tree[key] = (
             value
             if len(vector) == 1
-            else self._add_dict_branch(tree.get(key, {}), vector[1:], value)
+            else self._add_dict_branch(tree[key] if key in tree else {}, vector[1:], value)
         )
         return tree
 

dockertidy/logger.py

@@ -46,7 +46,7 @@ class LogFilter:
 class MultilineFormatter(logging.Formatter):
     """Logging Formatter to reset color after newline characters."""
 
-    def format(self, record):
+    def format(self, record):  # noqa
         record.msg = record.msg.replace("\n", f"\n{colorama.Style.RESET_ALL}... ")
         return logging.Formatter.format(self, record)
 
@@ -54,7 +54,7 @@ class MultilineFormatter(logging.Formatter):
 class MultilineJsonFormatter(jsonlogger.JsonFormatter):
     """Logging Formatter to remove newline characters."""
 
-    def format(self, record):
+    def format(self, record):  # noqa
         record.msg = record.msg.replace("\n", " ")
         return jsonlogger.JsonFormatter.format(self, record)
 

pyproject.toml

@@ -22,45 +22,49 @@ classifiers = [
 description = "Keep docker hosts tidy."
 documentation = "https://docker-tidy.geekdocs.de/"
 homepage = "https://docker-tidy.geekdocs.de/"
-include = ["LICENSE"]
+include = [
+  "LICENSE",
+]
 keywords = ["docker", "gc", "prune", "garbage"]
 license = "Apache-2.0"
 name = "docker-tidy"
-packages = [{ include = "dockertidy" }]
+packages = [
+  {include = "dockertidy"},
+]
 readme = "README.md"
 repository = "https://github.com/thegeeklab/docker-tidy/"
 version = "0.0.0"
 
 [tool.poetry.dependencies]
-anyconfig = "0.14.0"
+anyconfig = "0.13.0"
 appdirs = "1.4.4"
-certifi = "2024.6.2"
+certifi = "2023.11.17"
 colorama = "0.4.6"
 dateparser = "1.2.0"
-docker = "7.1.0"
+docker = "7.0.0"
 docker-pycreds = "0.4.0"
-environs = "11.0.0"
-idna = "3.7"
+environs = "10.3.0"
+idna = "3.6"
 ipaddress = "1.0.23"
-jsonschema = "4.22.0"
+jsonschema = "4.20.0"
 nested-lookup = "0.2.25"
 pathspec = "0.12.1"
 python = "^3.8.0"
-python-dateutil = "2.9.0.post0"
+python-dateutil = "2.8.2"
 python-json-logger = "2.0.7"
-requests = "2.32.3"
-"ruamel.yaml" = "0.18.6"
-websocket_client = "1.8.0"
-zipp = "3.19.2"
+requests = "2.31.0"
+"ruamel.yaml" = "0.18.5"
+websocket_client = "1.7.0"
+zipp = "3.17.0"
 
 [tool.poetry.scripts]
 docker-tidy = "dockertidy.cli:main"
 
 [tool.poetry.group.dev.dependencies]
-ruff = "0.4.9"
-pytest = "8.2.2"
-pytest-mock = "3.14.0"
-pytest-cov = "5.0.0"
+ruff = "0.1.11"
+pytest = "7.4.4"
+pytest-mock = "3.12.0"
+pytest-cov = "4.1.0"
 toml = "0.10.2"
 
 [tool.poetry-dynamic-versioning]
@@ -85,22 +89,21 @@ requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning"]
 
 [tool.ruff]
 exclude = [
-  ".git",
-  "__pycache__",
-  "build",
-  "dist",
-  "test",
-  "*.pyc",
-  "*.egg-info",
-  ".cache",
-  ".eggs",
-  "env*",
+    ".git",
+    "__pycache__",
+    "build",
+    "dist",
+    "test",
+    "*.pyc",
+    "*.egg-info",
+    ".cache",
+    ".eggs",
+    "env*",
 ]
 
 line-length = 99
 indent-width = 4
 
-[tool.ruff.lint]
 # Explanation of errors
 #
 # D102: Missing docstring in public method
@@ -111,36 +114,36 @@ indent-width = 4
 # D203: One blank line required before class docstring
 # D212: Multi-line docstring summary should start at the first line
 ignore = [
-  "D102",
-  "D103",
-  "D105",
-  "D107",
-  "D202",
-  "D203",
-  "D212",
-  "UP038",
-  "RUF012",
+    "D102",
+    "D103",
+    "D105",
+    "D107",
+    "D202",
+    "D203",
+    "D212",
+    "UP038",
+    "RUF012",
 ]
 select = [
-  "D",
-  "E",
-  "F",
-  "Q",
-  "W",
-  "I",
-  "S",
-  "BLE",
-  "N",
-  "UP",
-  "B",
-  "A",
-  "C4",
-  "T20",
-  "SIM",
-  "RET",
-  "ARG",
-  "ERA",
-  "RUF",
+    "D",
+    "E",
+    "F",
+    "Q",
+    "W",
+    "I",
+    "S",
+    "BLE",
+    "N",
+    "UP",
+    "B",
+    "A",
+    "C4",
+    "T20",
+    "SIM",
+    "RET",
+    "ARG",
+    "ERA",
+    "RUF",
 ]
 
 [tool.ruff.format]