refactor: rename docker-compose -> docker

Reviewed-on: #91
Co-authored-by: Timo Behrendt <t.behrendt@t00n.de>
Co-committed-by: Timo Behrendt <t.behrendt@t00n.de>

.bun-version

@@ -0,0 +1 @@
+1.3.14

.editorconfig

@@ -5,3 +5,4 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+max_line_length = 80

.gitea/workflows/cd.yaml

@@ -11,15 +11,15 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
       - name: Increment tag
         id: tag
-        uses: https://gitea.t000-n.de/t.behrendt/conventional-semantic-git-tag-increment@b8806ee0141a44be30e8734dff15001361be100c # 0.1.35
+        uses: https://gitea.t000-n.de/t.behrendt/conventional-semantic-git-tag-increment@e393dbb067c09fd43519392572ccf63b66cba92d # 0.1.39
         with:
           token: ${{ secrets.GITEA_TOKEN }}
           prerelease: ${{ github.event_name == 'workflow_dispatch' }}
-      - uses: https://gitea.t000-n.de/t.behrendt/actions/release-git-tag@38c1bbd8bad3e7965744d03de85faa4a5b808d1b # 0.2.4
+      - uses: https://gitea.t000-n.de/t.behrendt/actions/release-git-tag@29f50ea246d5d9a62ac3c611fa5c8a6e9846df5a # 0.2.8
         with:
           tag: ${{ steps.tag.outputs.new-tag }}

.gitea/workflows/ci.yaml

@@ -11,14 +11,30 @@ jobs:
       matrix:
         json-file:
           - "action.json"
+          - "actions.json"
           - "k8s.json"
           - "helm.json"
           - "common.json"
           - "docker-compose.json"
+          - "docker.json"
           - "bun-npm.json"
+          - "npm.json"
+          - "golang.json"
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Validate "${{ matrix.json-file }}"
-        uses: https://gitea.t000-n.de/t.behrendt/validate-json-by-json-schema-action@6bf2c1355ac4430a6fb77befd36fb95243fcaa3a # 0.1.12
+        uses: https://gitea.t000-n.de/t.behrendt/validate-json-by-json-schema-action@30070f7f9c7376fd87998980078688f61cecda59 # 0.1.13
         with:
           json-file: "./${{ matrix.json-file }}"
+
+  format:
+    name: Format
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: oven-sh/setup-bun@0c5077e51419868618aeaa5fe8019c62421857d6 # v2.2.0
+        with:
+          bun-version-file: ".bun-version"
+      - run: bun install --frozen-lockfile
+      - name: Check formatting
+        run: bun run fmt:check

.gitignore

@@ -0,0 +1,2 @@
+# dependencies (bun install)
+node_modules

.oxfmtrc.json

@@ -0,0 +1,4 @@
+{
+  "$schema": "./node_modules/oxfmt/configuration_schema.json",
+  "ignorePatterns": []
+}

action.json

@@ -1,10 +1,4 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["local>t.behrendt/renovate-configs:common", "helpers:pinGitHubActionDigests"],
+  "extends": ["local>t.behrendt/actions"]
-  "packageRules": [
-    {
-      "matchManagers": ["github-actions"],
-      "addLabels": ["deps", "action"]
-    }
-  ]
 }

actions.json

@@ -0,0 +1,79 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>t.behrendt/renovate-configs:common",
+    "helpers:pinGitHubActionDigests"
+  ],
+  "packageRules": [
+    {
+      "matchManagers": ["github-actions"],
+      "addLabels": ["deps", "action"]
+    },
+    {
+      "matchManagers": ["github-actions"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "groupName": "actions"
+    },
+    {
+      "matchManagers": ["github-actions"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "matchPackageNames": [
+        "actions/checkout",
+        "actions/cache",
+        "actions/cache/*",
+        "actions/setup-go",
+        "azure/setup-kubectl",
+        "azure/setup-helm",
+        "azure/k8s-set-context",
+        "azure/k8s-create-secret",
+        "azure/k8s-deploy",
+        "azure/k8s-lint",
+        "helmfile/helmfile-action",
+        "docker/setup-buildx-action",
+        "docker/login-action",
+        "docker/build-push-action",
+        "oven-sh/setup-bun"
+      ],
+      "automerge": true,
+      "platformAutomerge": true,
+      "automergeType": "pr",
+      "addLabels": ["automerge"]
+    },
+    {
+      "matchManagers": ["github-actions"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "matchPackageNames": [
+        "t.behrendt/actions",
+        "t.behrendt/actions/*",
+        "t.behrendt/conventional-semantic-git-tag-increment",
+        "t.behrendt/k_deploy_workflows",
+        "t.behrendt/validate-json-by-json-schema-action"
+      ],
+      "matchRegistryUrls": ["https://gitea.t000-n.de/**"],
+      "automerge": true,
+      "platformAutomerge": true,
+      "automergeType": "pr",
+      "addLabels": ["automerge"]
+    },
+    {
+      "matchManagers": ["github-actions"],
+      "matchUpdateTypes": ["major"],
+      "matchPackageNames": ["actions/checkout"],
+      "matchNewValue": "v7.0.0",
+      "automerge": true,
+      "platformAutomerge": true,
+      "automergeType": "pr",
+      "addLabels": ["automerge"]
+    },
+    {
+      "matchManagers": ["github-actions"],
+      "matchUpdateTypes": ["major"],
+      "matchPackageNames": ["actions/cache"],
+      "matchNewValue": "v6.0.0",
+      "automerge": true,
+      "platformAutomerge": true,
+      "automergeType": "pr",
+      "addLabels": ["automerge"]
+    }
+  ]
+}

bun-npm.json

@@ -1,20 +1,4 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["local>t.behrendt/renovate-configs:common"],
+  "extends": ["local>t.behrendt/renovate-configs:npm"]
-  "packageRules": [
-    {
-      "description": "Group all minor and patch updates together",
-      "groupName": "all non-major dependencies",
-      "groupSlug": "all-minor-patch",
-      "matchUpdateTypes": ["minor", "patch"],
-      "matchManagers": ["npm", "bun"]
-    },
-    {
-      "description": "Group Bun releases",
-      "groupName": "bun version",
-      "groupSlug": "bun-version",
-      "matchDatasources": ["github-tags", "docker"],
-      "matchPackageNames": ["docker.io/oven/bun", "oven-sh/bun", "Bun"]
-    }
-  ]
 }

bun.lock

@@ -0,0 +1,55 @@
+{
+  "lockfileVersion": 1,
+  "configVersion": 1,
+  "workspaces": {
+    "": {
+      "name": "renovate-configs",
+      "devDependencies": {
+        "oxfmt": "0.58.0",
+      },
+    },
+  },
+  "packages": {
+    "@oxfmt/binding-android-arm-eabi": ["@oxfmt/binding-android-arm-eabi@0.58.0", "", { "os": "android", "cpu": "arm" }, "sha512-Uz62sHduGGPftXtILGyxdSW4PX82rUg+rfdNqhsgxe881g4rIoXlIqmZQ6HVKcF4f+F8qMhdD03Bx5u7gmeTdg=="],
+
+    "@oxfmt/binding-android-arm64": ["@oxfmt/binding-android-arm64@0.58.0", "", { "os": "android", "cpu": "arm64" }, "sha512-rD0lRaJp1b+9vw6X4A2dJWKukd6X8yxiicN4JxXcXayolmUypRZxk+lKR+fVOu5q/iYc0fh5fR4bgmfOfVlbaA=="],
+
+    "@oxfmt/binding-darwin-arm64": ["@oxfmt/binding-darwin-arm64@0.58.0", "", { "os": "darwin", "cpu": "arm64" }, "sha512-uzbPPk7O6M+w2K65vcQ1woga3wgP8zghjL1KOG5b6qJ8dvYHZJ1VShaslg2KOK6yQIwCQtcMCXqLBM6sqXUNTg=="],
+
+    "@oxfmt/binding-darwin-x64": ["@oxfmt/binding-darwin-x64@0.58.0", "", { "os": "darwin", "cpu": "x64" }, "sha512-L0nKYDxU32oxeQqJj21W9SlIMnf81VZEhyah6iDvFhf5q0oynq498Fopth7blErUJVBpVtxQ98RMCfMPqpJX6w=="],
+
+    "@oxfmt/binding-freebsd-x64": ["@oxfmt/binding-freebsd-x64@0.58.0", "", { "os": "freebsd", "cpu": "x64" }, "sha512-woNwfD58dC5PGS9LSLSD5JYfo/EFK5iG9vhDWkcCg3q78ag7KC8bpDqgvPHrMoXpx83OLXxoSOhu6z8FsVTHlg=="],
+
+    "@oxfmt/binding-linux-arm-gnueabihf": ["@oxfmt/binding-linux-arm-gnueabihf@0.58.0", "", { "os": "linux", "cpu": "arm" }, "sha512-Sqs8nMLxuQpY21NKJ1u4stPDmO5hskBCNNh2E3AdCfI1QqWtf4m+Qn4mGEIUO4KGmuq3SWc/SZ80uy5IiwTCDw=="],
+
+    "@oxfmt/binding-linux-arm-musleabihf": ["@oxfmt/binding-linux-arm-musleabihf@0.58.0", "", { "os": "linux", "cpu": "arm" }, "sha512-Vd4exzBI5B5hB9m22JiTQzIL23WvHo/Pe+sNXPNeBLXSP9swCBPKCEBRwKpmpQzYhlgYaCgfPcGXPKAJBRIiZQ=="],
+
+    "@oxfmt/binding-linux-arm64-gnu": ["@oxfmt/binding-linux-arm64-gnu@0.58.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-bUWi5mHV+4Vi56RLHE1h6q/HHfwAIT3XoB9vJAVeRzfu5NriXM8y6eeJu0vlKa0C9kq2rq1sOWRClhdLHPocrg=="],
+
+    "@oxfmt/binding-linux-arm64-musl": ["@oxfmt/binding-linux-arm64-musl@0.58.0", "", { "os": "linux", "cpu": "arm64" }, "sha512-2ZHxemzgHcjtktAuVUwSoyXmGo/t+aF5tS1ciPpPei4rhSyrz3JOqDosXXrmhN/yLUSzJjtuW7ToTWqfQpCj2w=="],
+
+    "@oxfmt/binding-linux-ppc64-gnu": ["@oxfmt/binding-linux-ppc64-gnu@0.58.0", "", { "os": "linux", "cpu": "ppc64" }, "sha512-AwKkVwjVmFQ3bcO7j0McGYAqCKH2a326fswfofng/E8VewCT/raeeGQr4huVhY704deK8AWASSTlxzMj0eZc6Q=="],
+
+    "@oxfmt/binding-linux-riscv64-gnu": ["@oxfmt/binding-linux-riscv64-gnu@0.58.0", "", { "os": "linux", "cpu": "none" }, "sha512-xsRpTxfUnJF8D3AUKko/qyWdjw4GZVHlCVFuGlzSCTeewLmykKINW8em1+wx+axsDVtJJcMtvsiaXggXxrlHgw=="],
+
+    "@oxfmt/binding-linux-riscv64-musl": ["@oxfmt/binding-linux-riscv64-musl@0.58.0", "", { "os": "linux", "cpu": "none" }, "sha512-Z4AYOTcy7nYEIiXwD62PlerimyYRcfJOgUbQAEBjXz098kxKuERBlRntofGy69HHhe9E0TLVNMl1yspVNu+efw=="],
+
+    "@oxfmt/binding-linux-s390x-gnu": ["@oxfmt/binding-linux-s390x-gnu@0.58.0", "", { "os": "linux", "cpu": "s390x" }, "sha512-A3nhhtZPC/TKVWOPj9q/H3p2znJDCcHWYlJBhWL8hGq/bFmBaNBHC8Np6E581yVq1w9Mi3rMDNzDalWvtUfJtQ=="],
+
+    "@oxfmt/binding-linux-x64-gnu": ["@oxfmt/binding-linux-x64-gnu@0.58.0", "", { "os": "linux", "cpu": "x64" }, "sha512-2g+tVkgwqphw8R4hgo+kF4oz8+P5RwVOtr9+irsC7uwEp0e9j7Crw8kDGKL20uYlLPD7g02DqA61mC/UNYx98A=="],
+
+    "@oxfmt/binding-linux-x64-musl": ["@oxfmt/binding-linux-x64-musl@0.58.0", "", { "os": "linux", "cpu": "x64" }, "sha512-rc15P6AbyyB7426aN8AakLd02Trb3a6ML/mmfAQeVHJEfVofWLcWIrBdy6zDEY+DIaL/s8E4GGPboVw+oP3+EA=="],
+
+    "@oxfmt/binding-openharmony-arm64": ["@oxfmt/binding-openharmony-arm64@0.58.0", "", { "os": "none", "cpu": "arm64" }, "sha512-ZWoTM27/HYPOh9iq86DAbhPu9nXb8qKvvGU/h8OfliyVUFAMMNTLDkGsWDKKnDqIkqvZ9+dXlgUOsH1LYO3O7g=="],
+
+    "@oxfmt/binding-win32-arm64-msvc": ["@oxfmt/binding-win32-arm64-msvc@0.58.0", "", { "os": "win32", "cpu": "arm64" }, "sha512-LHZnqFXe2dEfkRI4XdZS/57nEOT/I4UCRX5IyM9v4GYW9XwQCjGe1IUK59SuKw3POwvcgWQ4pme2cYXmNqTNPg=="],
+
+    "@oxfmt/binding-win32-ia32-msvc": ["@oxfmt/binding-win32-ia32-msvc@0.58.0", "", { "os": "win32", "cpu": "ia32" }, "sha512-mZKpg20TpheCJym1rarcZCUJeW1sSruw8zAAaCYWvuVfwIUDN1CXdrPU/JgCWReXTCTrEfCB8Wyo3hh9jSZ2EA=="],
+
+    "@oxfmt/binding-win32-x64-msvc": ["@oxfmt/binding-win32-x64-msvc@0.58.0", "", { "os": "win32", "cpu": "x64" }, "sha512-N/wUU4N5PZ2orBtI+Ko7MnMfYLfE7K91UrGMY/c/pYyHR3lA9kwst1XugkZx+92YcRh/Eo+iv2eTESSWXfiZPA=="],
+
+    "oxfmt": ["oxfmt@0.58.0", "", { "dependencies": { "tinypool": "2.1.0" }, "optionalDependencies": { "@oxfmt/binding-android-arm-eabi": "0.58.0", "@oxfmt/binding-android-arm64": "0.58.0", "@oxfmt/binding-darwin-arm64": "0.58.0", "@oxfmt/binding-darwin-x64": "0.58.0", "@oxfmt/binding-freebsd-x64": "0.58.0", "@oxfmt/binding-linux-arm-gnueabihf": "0.58.0", "@oxfmt/binding-linux-arm-musleabihf": "0.58.0", "@oxfmt/binding-linux-arm64-gnu": "0.58.0", "@oxfmt/binding-linux-arm64-musl": "0.58.0", "@oxfmt/binding-linux-ppc64-gnu": "0.58.0", "@oxfmt/binding-linux-riscv64-gnu": "0.58.0", "@oxfmt/binding-linux-riscv64-musl": "0.58.0", "@oxfmt/binding-linux-s390x-gnu": "0.58.0", "@oxfmt/binding-linux-x64-gnu": "0.58.0", "@oxfmt/binding-linux-x64-musl": "0.58.0", "@oxfmt/binding-openharmony-arm64": "0.58.0", "@oxfmt/binding-win32-arm64-msvc": "0.58.0", "@oxfmt/binding-win32-ia32-msvc": "0.58.0", "@oxfmt/binding-win32-x64-msvc": "0.58.0" }, "peerDependencies": { "svelte": "^5.0.0", "vite-plus": "*" }, "optionalPeers": ["svelte", "vite-plus"], "bin": { "oxfmt": "bin/oxfmt" } }, "sha512-8feG/7NVEHDVwc1OUpP6Pks+TnaDFUw2jLLFIMi5bcmmwxAX2wBQvjSzj62RRTYBf2Op1Wt8xbkmagmPTR5ETg=="],
+
+    "tinypool": ["tinypool@2.1.0", "", {}, "sha512-Pugqs6M0m7Lv1I7FtxN4aoyToKg1C4tu+/381vH35y8oENM/Ai7f7C4StcoK4/+BSw9ebcS8jRiVrORFKCALLw=="],
+  }
+}

common.json

@@ -2,20 +2,60 @@
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "dependencyDashboard": true,
   "semanticCommits": "enabled",
-  "extends": ["config:best-practices", ":semanticCommitTypeAll(chore)"],
+  "extends": [
+    "config:recommended",
+    "docker:pinDigests",
+    "helpers:pinGitHubActionDigests",
+    ":configMigration",
+    ":pinDevDependencies",
+    "abandonments:recommended",
+    ":maintainLockFilesWeekly",
+    ":semanticCommitTypeAll(chore)"
+  ],
   "packageRules": [
     {
-      "description": "Don't update dependencies unless they are at least 7 days old",
+      "description": "Don't update dependencies unless they are at least 7 days old (except for internal deps).",
-      "matchPackageNames": ["*"],
+      "matchPackageNames": ["!t.behrendt/**", "gitea.t000-n.de/t.behrendt/**"],
       "minimumReleaseAge": "7 days",
       "minimumReleaseAgeBehaviour": "timestamp-required",
       "internalChecksFilter": "strict"
     },
     {
-      "description": "Exempt local dependencies from the minimum release age (last rule wins over earlier packageRules for the same options)",
+      "matchManagers": ["renovate-config"],
-      "matchPackageNames": ["/^(https:\\/\\/)?gitea\\.t000-n\\.de/"],
+      "matchPackageNames": ["local>t.behrendt/renovate-configs:action"],
-      "minimumReleaseAge": "0 days",
+      "replacementName": "local>t.behrendt/renovate-configs:actions",
-      "internalChecksFilter": "none"
+      "automerge": true,
+      "platformAutomerge": true,
+      "automergeType": "pr",
+      "addLabels": ["automerge"]
+    },
+    {
+      "matchManagers": ["renovate-config"],
+      "matchPackageNames": ["local>t.behrendt/renovate-configs:bun-npm"],
+      "replacementName": "local>t.behrendt/renovate-configs:npm",
+      "automerge": true,
+      "platformAutomerge": true,
+      "automergeType": "pr",
+      "addLabels": ["automerge"]
+    },
+    {
+      "matchManagers": ["renovate-config"],
+      "matchPackageNames": ["local>t.behrendt/renovate-configs:docker-compose"],
+      "replacementName": "local>t.behrendt/renovate-configs:docker",
+      "automerge": true,
+      "platformAutomerge": true,
+      "automergeType": "pr",
+      "addLabels": ["automerge"]
     }
-  ]
+  ],
+  "osvVulnerabilityAlerts": true,
+  "dependencyDashboardOSVVulnerabilitySummary": "all",
+  "vulnerabilityAlerts": {
+    "enabled": true,
+    "automerge": true,
+    "platformAutomerge": true,
+    "automergeType": "pr",
+    "addLabels": ["automerge", "security"],
+    "vulnerabilityFixStrategy": "lowest"
+  }
 }

docker-compose.json

@@ -1,10 +1,4 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["local>t.behrendt/renovate-configs:common"],
+  "extends": ["local>t.behrendt/renovate-configs:docker"]
-  "docker-compose": {
-    "digest": {
-      "enabled": true
-    },
-    "addLabels": ["deps", "docker"]
-  }
 }

docker.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["local>t.behrendt/renovate-configs:common"],
+  "docker-compose": {
+    "digest": {
+      "enabled": true
+    },
+    "addLabels": ["deps", "docker"]
+  }
+}

golang.json

@@ -0,0 +1,15 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["local>t.behrendt/renovate-configs:common"],
+  "packageRules": [
+    {
+      "matchManagers": ["gomod"],
+      "addLabels": ["deps", "go"]
+    },
+    {
+      "matchPackageNames": ["golang", "gomod", "go"],
+      "groupName": "go version",
+      "matchUpdateTypes": ["major", "minor", "patch"]
+    }
+  ]
+}

helm.json

@@ -8,7 +8,8 @@
     {
       "matchManagers": ["helm-values"],
       "versioning": "docker",
-      "separateMinorPatch": true
+      "separateMinorPatch": true,
+      "addLabels": ["deps", "helm"]
     }
   ],
   "helmfile": {

k8s.json

@@ -4,5 +4,17 @@
   "kubernetes": {
     "enabled": true,
     "labels": ["deps", "k8s"]
-  }
+  },
+  "packageRules": [
+    {
+      "description": "Replace git-commit image tags with semver tags for backupsidecar",
+      "matchDatasources": ["docker"],
+      "matchManagers": ["kubernetes"],
+      "matchPackageNames": ["gitea.t000-n.de/t.behrendt/backupsidecar"],
+      "matchCurrentValue": "/^[a-f0-9]{40}$/",
+      "replacementVersion": "0.2.17",
+      "versioning": "semver",
+      "pinDigests": true
+    }
+  ]
 }

npm.json

@@ -0,0 +1,32 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["local>t.behrendt/renovate-configs:common"],
+  "packageRules": [
+    {
+      "matchManagers": ["npm", "bun"],
+      "addLabels": ["deps", "npm"]
+    },
+    {
+      "description": "Group all minor and patch updates together",
+      "groupName": "all non-major dependencies",
+      "groupSlug": "all-minor-patch",
+      "matchUpdateTypes": ["minor", "patch"],
+      "matchManagers": ["npm", "bun"]
+    },
+    {
+      "description": "Group Bun runtime version",
+      "groupName": "bun version",
+      "groupSlug": "bun-version",
+      "matchManagers": ["bun-version"],
+      "matchPackageNames": ["Bun", "bun"]
+    },
+    {
+      "description": "Group Bun Docker image",
+      "groupName": "bun version",
+      "groupSlug": "bun-version",
+      "matchDatasources": ["docker"],
+      "matchPackageNames": ["docker.io/oven/bun", "oven/bun"],
+      "additionalBranchPrefix": ""
+    }
+  ]
+}

package.json

@@ -0,0 +1,11 @@
+{
+  "name": "renovate-configs",
+  "private": true,
+  "scripts": {
+    "fmt": "oxfmt -c .oxfmtrc.json",
+    "fmt:check": "oxfmt -c .oxfmtrc.json --check"
+  },
+  "devDependencies": {
+    "oxfmt": "0.58.0"
+  }
+}

renovate.json

@@ -1,6 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "local>t.behrendt/renovate-configs:action"
+    "local>t.behrendt/renovate-configs:action",
+    "local>t.behrendt/renovate-configs:bun-npm"
   ]
 }