Merge branch 'main' into kimbo128/main - resolve conflicts

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# GitHub Funding Configuration
+
+github: [czlonkowski]

.github/workflows/docker-build.yml

@@ -7,9 +7,25 @@ on:
       - main
     tags:
       - 'v*'
+    paths-ignore:
+      - '**.md'
+      - '.github/FUNDING.yml'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/pull_request_template.md'
+      - 'LICENSE'
+      - 'ATTRIBUTION.md'
+      - 'docs/**'
   pull_request:
     branches:
       - main
+    paths-ignore:
+      - '**.md'
+      - '.github/FUNDING.yml'
+      - '.github/ISSUE_TEMPLATE/**'
+      - '.github/pull_request_template.md'
+      - 'LICENSE'
+      - 'ATTRIBUTION.md'
+      - 'docs/**'
   workflow_dispatch:
 
 env:
@@ -56,7 +72,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
-            type=sha,prefix={{branch}}-,format=short
+            type=sha,format=short
             type=raw,value=latest,enable={{is_default_branch}}
             
       - name: Build and push Docker image