From 2fb1a240a0aa9dc779e31b5c03e73b0b303945b3 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Wed, 1 Jan 2025 10:26:08 -0600 Subject: [PATCH] docker hub auth --- .forgejo/actions/renovate/action.yaml | 4 ++-- .forgejo/workflows/renovate.yaml | 7 ++++++- renovate.json5 => renovate.json | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) rename renovate.json5 => renovate.json (83%) diff --git a/.forgejo/actions/renovate/action.yaml b/.forgejo/actions/renovate/action.yaml index 28c882a..7032a20 100644 --- a/.forgejo/actions/renovate/action.yaml +++ b/.forgejo/actions/renovate/action.yaml @@ -39,11 +39,11 @@ runs: GITHUB_COM_TOKEN: ${{ inputs.github-token }} LOG_LEVEL: debug RENOVATE_BASE_DIR: ${{ github.workspace }}/.tmp - RENOVATE_ENDPOINT: ${{ inputs.endpoint }} + RENOVATE_ENDPOINT: ${{ github.server_url }} + RENOVATE_GIT_AUTHOR: 'Renovate Bot ' RENOVATE_PLATFORM: gitea RENOVATE_REPOSITORY_CACHE: 'enabled' RENOVATE_TOKEN: ${{ inputs.token }} - RENOVATE_GIT_AUTHOR: 'Renovate Bot ' GIT_AUTHOR_NAME: 'Renovate Bot' GIT_AUTHOR_EMAIL: 'smeagol@hsn.dev' diff --git a/.forgejo/workflows/renovate.yaml b/.forgejo/workflows/renovate.yaml index cd25f3f..1757b4c 100644 --- a/.forgejo/workflows/renovate.yaml +++ b/.forgejo/workflows/renovate.yaml @@ -13,6 +13,8 @@ on: type: boolean env: RENOVATE_DRY_RUN: "${{ inputs.dryRun == true }}" + DOCKER_USERNAME: "${{ secrets.DOCKER_USERNAME }}" + DOCKER_PASSWORD: "${{ secrets.DOCKER_PASSWORD }}" jobs: renovate: name: Renovate @@ -42,5 +44,8 @@ jobs: endpoint: https://git.hsn.dev/api/v1/ token: ${{ secrets.RENOVATE_TOKEN }} github-token: ${{ secrets.GH_TOKEN }} - args: --platform gitea --autodiscover + args: >- + --platform gitea + --autodiscover + --host-rules='[{"matchHost":"docker.io","username":"${{ env.DOCKER_USERNAME }}","password":"${{ env.DOCKER_PASSWORD }}"}]' save-cache: true diff --git a/renovate.json5 b/renovate.json similarity index 83% rename from renovate.json5 rename to renovate.json index 4c1cc7e..4649aaf 100644 --- a/renovate.json5 +++ b/renovate.json @@ -5,13 +5,13 @@ "semanticCommits": "enabled", "packageRules": [ { - "description": "use fix scope for renovate updates", + "description": "Use fix scope for renovate updates", "matchPackageNames": ["ghcr.io/renovatebot/renovate"], "semanticCommitType": "fix" }, { "automerge": true, - "automergeType": "branch", // Directly merge to the branch without PR + "automergeType": "branch", "description": "Automerge renovate updates", "ignoreTests": true, "matchPackageNames": ["ghcr.io/renovatebot/renovate"],