Create only one branch per Dockerfile for all non major update

[gregoryboue]

How are you running Renovate?

Self-hosted

If you're self-hosting Renovate, tell us what version of Renovate you run.

37.162.1

If you're self-hosting Renovate, select which platform you are using.

GitLab self-hosted

What is your question?

With the following git repository :

jdk
├── 11
│   ├── alpine
│   │   └── Dockerfile
│   └── ubuntu
│       └── jammy
│           └── Dockerfile
└── 17
    ├── alpine
    │   └── Dockerfile
    └── ubuntu
        └── jammy
            └── Dockerfile

And for example the following 11/alpine/Dockerfile :

FROM docker-public-artefact-repo.apps.eul.sncf.fr/eclipse-temurin:11.0.21_9-jdk-alpine@sha256:0f42a9544bb88d43ce43e6668cf52423951099e14761d35779d0175414f0dd06
.....

With the following renovate config :

{
  "extends": [
     ":dependencyDashboard",
     ":semanticPrefixFixDepsChoreOthers",
     ":automergePr",
     ":automergeRequireAllStatusChecks",
     ":disableMajorUpdates",
     "docker:pinDigests",
     "replacements:all",
     "workarounds:all"
  ],
  "platformAutomerge" : true,
  "automerge": false,
  "rebaseWhen": "conflicted",
  "prConcurrentLimit": 0,
  "prHourlyLimit": 0,
  "branchConcurrentLimit":0,
  "baseBranches": ["main"],
  "enabledManagers": ["dockerfile"],
  "recreateWhen": "always",
  "packageRules": [
     {
        "matchManagers": ["dockerfile"],
        "enabled": true,
        "matchUpdateTypes": [
          "minor",
          "patch",
          "build"
        ],
      }
    ]
}

When a patch update is published and in the same time a new pindigest for the existing version (this really happened), then renovate creates two branches and two PR, for example

PR1(patch) :

- FROM docker-public-artefact-repo.apps.eul.sncf.fr/eclipse-temurin:11.0.21_9-jdk-alpine@sha256:0f42a9544bb88d43ce43e6668cf52423951099e14761d35779d0175414f0dd06
+ FROM docker-public-artefact-repo.apps.eul.sncf.fr/eclipse-temurin:11.0.22_7-jdk-alpine@sha256:0a0051c3c30b8a6c33ceb0f261a30046c81cd6010aa8970ff85c93d36810604a

PR2 (pindigest):

- FROM docker-public-artefact-repo.apps.eul.sncf.fr/eclipse-temurin:11.0.21_9-jdk-alpine@sha256:0f42a9544bb88d43ce43e6668cf52423951099e14761d35779d0175414f0dd06
+ FROM docker-public-artefact-repo.apps.eul.sncf.fr/eclipse-temurin:11.0.21_9-jdk-alpine@sha256:a13fd5efc8a1be0e2040805915702d5d697c56b420f7c93e06fab60272cdea3a

I would find a simple way to tell renovate to don't separate minor/patch/pinDigest in branch creation, does anyone have the same problem?

I found a way to do this but i think it's not the best way :

.....
"packageRules": [
      {
        "matchManagers": ["dockerfile"],
        "enabled": true,
        "matchFileNames": ["11/alpine/Dockerfile"],
        "groupName": "11-alpine changes",
        "groupSlug": "11-alpine"
      },
      {
        "matchManagers": ["dockerfile"],
        "enabled": true,
        "matchFileNames": ["11/ubuntu/jammy/Dockerfile"],
        "groupName": "11-ubuntu changes",
        "groupSlug": "11-ubuntu"
      },
      {
        "matchManagers": ["dockerfile"],
        "enabled": true,
        "matchFileNames": ["17/alpine/Dockerfile"],
        "groupName": "17-alpine changes",
        "groupSlug": "17-alpine"
      },
      {
        "matchManagers": ["dockerfile"],
        "enabled": true,
        "matchFileNames": ["17/ubuntu/jammy/Dockerfile"],
        "groupName": "17-ubuntu changes",
        "groupSlug": "17-ubuntu"
      },
      {
        "matchManagers": ["dockerfile"],
        "enabled": false,
        "matchUpdateTypes": [
          "major"
        ],
      }
    ]

Logs (if relevant)

Logs

Copy/paste the relevant log(s) here, between the starting and ending backticks

[rarkins]

First you will want to split updates by parent directory by setting additionalBranchPrefix to be {{parentDir}}. Then you want to add a "group all" rule so that all within each directory are grouped together.

[rarkins]

Looks fine although the enabled=true in the first rule is unnecessary