From 99b3eadbed9a02698c44d4335179cdede78c372e Mon Sep 17 00:00:00 2001
From: Mathias Brodala <mbrodala@pagemachine.de>
Date: Thu, 4 Jul 2024 18:01:04 +0200
Subject: [PATCH 1/6] docs(platform/gitlab): Mention DOCKER_REGISTRY_* CI
 variables for authentication

See https://github.com/renovatebot/renovate/issues/17940
---
 lib/modules/platform/gitlab/readme.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/modules/platform/gitlab/readme.md b/lib/modules/platform/gitlab/readme.md
index c9293f90d26b38..522587de069e10 100644
--- a/lib/modules/platform/gitlab/readme.md
+++ b/lib/modules/platform/gitlab/readme.md
@@ -41,6 +41,8 @@ Remember to set `platform=gitlab` somewhere in your Renovate config file.
 If you're using a private [GitLab container registry](https://docs.gitlab.com/ee/user/packages/container_registry/), you must:
 
 - Set the `RENOVATE_HOST_RULES` CI variable to `[{"matchHost": "${CI_REGISTRY}","username": "${GITLAB_USER_NAME}","password": "${RENOVATE_TOKEN}", "hostType": "docker"}]`.
+
+  Alternatively you can set the CI variables `DOCKER_REGISTRY_GITLAB_COM_USERNAME=${GITLAB_USER_NAME}` and `DOCKER_REGISTRY_GITLAB_COM_PASSWORD=${RENOVATE_TOKEN}`. (See [issue #17940](https://github.com/renovatebot/renovate/issues/17940))
 - Make sure the user that owns the access token is a member of the corresponding GitLab projects/groups with the right permissions.
 - Make sure the access token has the `read_registry` scope.
 

From f87a84edac87f75c025642d10c3ff765c8812753 Mon Sep 17 00:00:00 2001
From: Mathias Brodala <mbrodala@pagemachine.de>
Date: Fri, 5 Jul 2024 09:58:23 +0200
Subject: [PATCH 2/6] docs(platform/gitlab): Mention "detectHostRulesFromEnv"
 for "DOCKER_REGISTRY_*" variables

---
 lib/modules/platform/gitlab/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/modules/platform/gitlab/readme.md b/lib/modules/platform/gitlab/readme.md
index 522587de069e10..6ae0c7b6267ab7 100644
--- a/lib/modules/platform/gitlab/readme.md
+++ b/lib/modules/platform/gitlab/readme.md
@@ -42,7 +42,7 @@ If you're using a private [GitLab container registry](https://docs.gitlab.com/ee
 
 - Set the `RENOVATE_HOST_RULES` CI variable to `[{"matchHost": "${CI_REGISTRY}","username": "${GITLAB_USER_NAME}","password": "${RENOVATE_TOKEN}", "hostType": "docker"}]`.
 
-  Alternatively you can set the CI variables `DOCKER_REGISTRY_GITLAB_COM_USERNAME=${GITLAB_USER_NAME}` and `DOCKER_REGISTRY_GITLAB_COM_PASSWORD=${RENOVATE_TOKEN}`. (See [issue #17940](https://github.com/renovatebot/renovate/issues/17940))
+  Alternatively, if [`detectHostRulesFromEnv`](../../../../docs/usage/self-hosted-configuration.md#detecthostrulesfromenv) is enabled, you can set the CI variables `DOCKER_REGISTRY_GITLAB_COM_USERNAME=${GITLAB_USER_NAME}` and `DOCKER_REGISTRY_GITLAB_COM_PASSWORD=${RENOVATE_TOKEN}`. (See [issue #17940](https://github.com/renovatebot/renovate/issues/17940))
 - Make sure the user that owns the access token is a member of the corresponding GitLab projects/groups with the right permissions.
 - Make sure the access token has the `read_registry` scope.
 

From f62abe0491cd22dee6c7fabc17f070a895cb76b4 Mon Sep 17 00:00:00 2001
From: Mathias Brodala <mbrodala@pagemachine.de>
Date: Mon, 8 Jul 2024 08:55:07 +0200
Subject: [PATCH 3/6] Update lib/modules/platform/gitlab/readme.md

Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
---
 lib/modules/platform/gitlab/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/modules/platform/gitlab/readme.md b/lib/modules/platform/gitlab/readme.md
index 6ae0c7b6267ab7..3fd2b496305494 100644
--- a/lib/modules/platform/gitlab/readme.md
+++ b/lib/modules/platform/gitlab/readme.md
@@ -42,7 +42,7 @@ If you're using a private [GitLab container registry](https://docs.gitlab.com/ee
 
 - Set the `RENOVATE_HOST_RULES` CI variable to `[{"matchHost": "${CI_REGISTRY}","username": "${GITLAB_USER_NAME}","password": "${RENOVATE_TOKEN}", "hostType": "docker"}]`.
 
-  Alternatively, if [`detectHostRulesFromEnv`](../../../../docs/usage/self-hosted-configuration.md#detecthostrulesfromenv) is enabled, you can set the CI variables `DOCKER_REGISTRY_GITLAB_COM_USERNAME=${GITLAB_USER_NAME}` and `DOCKER_REGISTRY_GITLAB_COM_PASSWORD=${RENOVATE_TOKEN}`. (See [issue #17940](https://github.com/renovatebot/renovate/issues/17940))
+  Alternatively, if [`detectHostRulesFromEnv`](../../../../docs/usage/self-hosted-configuration.md#detecthostrulesfromenv) is enabled, you can set the CI variables `DOCKER_REGISTRY_GITLAB_COM_USERNAME=${GITLAB_USER_NAME}` and `DOCKER_REGISTRY_GITLAB_COM_PASSWORD=${RENOVATE_TOKEN}`.
 - Make sure the user that owns the access token is a member of the corresponding GitLab projects/groups with the right permissions.
 - Make sure the access token has the `read_registry` scope.
 

From 35f77e6a56e7e632f3888502e26cf508dae31f13 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 21 Aug 2024 13:52:43 +0200
Subject: [PATCH 4/6] prettier-fix

---
 lib/modules/platform/gitlab/readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/modules/platform/gitlab/readme.md b/lib/modules/platform/gitlab/readme.md
index 3fd2b496305494..0b70541e54dde8 100644
--- a/lib/modules/platform/gitlab/readme.md
+++ b/lib/modules/platform/gitlab/readme.md
@@ -43,6 +43,7 @@ If you're using a private [GitLab container registry](https://docs.gitlab.com/ee
 - Set the `RENOVATE_HOST_RULES` CI variable to `[{"matchHost": "${CI_REGISTRY}","username": "${GITLAB_USER_NAME}","password": "${RENOVATE_TOKEN}", "hostType": "docker"}]`.
 
   Alternatively, if [`detectHostRulesFromEnv`](../../../../docs/usage/self-hosted-configuration.md#detecthostrulesfromenv) is enabled, you can set the CI variables `DOCKER_REGISTRY_GITLAB_COM_USERNAME=${GITLAB_USER_NAME}` and `DOCKER_REGISTRY_GITLAB_COM_PASSWORD=${RENOVATE_TOKEN}`.
+
 - Make sure the user that owns the access token is a member of the corresponding GitLab projects/groups with the right permissions.
 - Make sure the access token has the `read_registry` scope.
 

From 7b4bcf0d09b60c1321de13e55ac88921095a80bc Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Mon, 23 Sep 2024 18:30:55 +0200
Subject: [PATCH 5/6] Update lib/modules/platform/gitlab/readme.md

---
 lib/modules/platform/gitlab/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/modules/platform/gitlab/readme.md b/lib/modules/platform/gitlab/readme.md
index 0b70541e54dde8..d227289f634439 100644
--- a/lib/modules/platform/gitlab/readme.md
+++ b/lib/modules/platform/gitlab/readme.md
@@ -42,7 +42,7 @@ If you're using a private [GitLab container registry](https://docs.gitlab.com/ee
 
 - Set the `RENOVATE_HOST_RULES` CI variable to `[{"matchHost": "${CI_REGISTRY}","username": "${GITLAB_USER_NAME}","password": "${RENOVATE_TOKEN}", "hostType": "docker"}]`.
 
-  Alternatively, if [`detectHostRulesFromEnv`](../../../../docs/usage/self-hosted-configuration.md#detecthostrulesfromenv) is enabled, you can set the CI variables `DOCKER_REGISTRY_GITLAB_COM_USERNAME=${GITLAB_USER_NAME}` and `DOCKER_REGISTRY_GITLAB_COM_PASSWORD=${RENOVATE_TOKEN}`.
+  Alternatively, if [`detectHostRulesFromEnv`](../../../../self-hosted-configuration.md#detecthostrulesfromenv) is enabled, you can set the CI variables `DOCKER_REGISTRY_GITLAB_COM_USERNAME=${GITLAB_USER_NAME}` and `DOCKER_REGISTRY_GITLAB_COM_PASSWORD=${RENOVATE_TOKEN}`.
 
 - Make sure the user that owns the access token is a member of the corresponding GitLab projects/groups with the right permissions.
 - Make sure the access token has the `read_registry` scope.

From 43e9553af977da494270942cdc6d634f9387cefd Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Mon, 23 Sep 2024 18:50:27 +0200
Subject: [PATCH 6/6] Update lib/modules/platform/gitlab/readme.md

---
 lib/modules/platform/gitlab/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/modules/platform/gitlab/readme.md b/lib/modules/platform/gitlab/readme.md
index d227289f634439..816dd3e3100f51 100644
--- a/lib/modules/platform/gitlab/readme.md
+++ b/lib/modules/platform/gitlab/readme.md
@@ -42,7 +42,7 @@ If you're using a private [GitLab container registry](https://docs.gitlab.com/ee
 
 - Set the `RENOVATE_HOST_RULES` CI variable to `[{"matchHost": "${CI_REGISTRY}","username": "${GITLAB_USER_NAME}","password": "${RENOVATE_TOKEN}", "hostType": "docker"}]`.
 
-  Alternatively, if [`detectHostRulesFromEnv`](../../../../self-hosted-configuration.md#detecthostrulesfromenv) is enabled, you can set the CI variables `DOCKER_REGISTRY_GITLAB_COM_USERNAME=${GITLAB_USER_NAME}` and `DOCKER_REGISTRY_GITLAB_COM_PASSWORD=${RENOVATE_TOKEN}`.
+  Alternatively, if [`detectHostRulesFromEnv`](../../../self-hosted-configuration.md#detecthostrulesfromenv) is enabled, you can set the CI variables `DOCKER_REGISTRY_GITLAB_COM_USERNAME=${GITLAB_USER_NAME}` and `DOCKER_REGISTRY_GITLAB_COM_PASSWORD=${RENOVATE_TOKEN}`.
 
 - Make sure the user that owns the access token is a member of the corresponding GitLab projects/groups with the right permissions.
 - Make sure the access token has the `read_registry` scope.