From f65369d1557ad7fb6bc6907a5bbeaae6cba8cc39 Mon Sep 17 00:00:00 2001
From: Patrick Madela <patrick.madela@synchrotron-soleil.fr>
Date: Sun, 9 Feb 2025 18:04:17 +0100
Subject: [PATCH] Try to replace CI_REGISTRY_PASSWORD by CI_JOB_TOKEN to fix
 login to docker registry

---
 conan-el6-gcc44-x86/.gitlab-ci.yml | 3 ++-
 conan-el6-gcc44/.gitlab-ci.yml     | 3 ++-
 conan-el6-gcc91-x86/.gitlab-ci.yml | 3 ++-
 conan-el6-gcc91/.gitlab-ci.yml     | 3 ++-
 conan-el7-gcc48-x86/.gitlab-ci.yml | 3 ++-
 conan-el7-gcc48/.gitlab-ci.yml     | 3 ++-
 conan-el7-gcc93-x86/.gitlab-ci.yml | 3 ++-
 conan-el7-gcc93/.gitlab-ci.yml     | 3 ++-
 conan-el9-gcc114/.gitlab-ci.yml    | 3 ++-
 9 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml
index a68f887..a1e632a 100644
--- a/conan-el6-gcc44-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc44-x86/.gitlab-ci.yml
@@ -14,7 +14,8 @@ stages:
     - triggers
 
 before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
+
 
 build:
     stage: build
diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml
index b01191f..305ecdf 100644
--- a/conan-el6-gcc44/.gitlab-ci.yml
+++ b/conan-el6-gcc44/.gitlab-ci.yml
@@ -14,7 +14,8 @@ stages:
     - triggers
 
 before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
+
 
 build:
     stage: build
diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml
index 44f9c0d..abacba4 100644
--- a/conan-el6-gcc91-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc91-x86/.gitlab-ci.yml
@@ -13,7 +13,8 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
+
 
 build:
     stage: build
diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml
index e0b51bc..2b2187a 100644
--- a/conan-el6-gcc91/.gitlab-ci.yml
+++ b/conan-el6-gcc91/.gitlab-ci.yml
@@ -13,7 +13,8 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
+
 
 build:
     stage: build
diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml
index 8d47c7b..f4f0a84 100644
--- a/conan-el7-gcc48-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc48-x86/.gitlab-ci.yml
@@ -14,7 +14,8 @@ stages:
     - triggers
 
 before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
+
 
 build:
     stage: build
diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml
index dad108f..5bbbdde 100644
--- a/conan-el7-gcc48/.gitlab-ci.yml
+++ b/conan-el7-gcc48/.gitlab-ci.yml
@@ -14,7 +14,8 @@ stages:
     - triggers
 
 before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
+
 
 build:
     stage: build
diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml
index 2b2e23f..1cd3d3e 100644
--- a/conan-el7-gcc93-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc93-x86/.gitlab-ci.yml
@@ -13,7 +13,8 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
+
 
 build:
     stage: build
diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml
index e1bff23..8410608 100644
--- a/conan-el7-gcc93/.gitlab-ci.yml
+++ b/conan-el7-gcc93/.gitlab-ci.yml
@@ -13,7 +13,8 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
+
 
 build:
     stage: build
diff --git a/conan-el9-gcc114/.gitlab-ci.yml b/conan-el9-gcc114/.gitlab-ci.yml
index 427c284..a6125d4 100644
--- a/conan-el9-gcc114/.gitlab-ci.yml
+++ b/conan-el9-gcc114/.gitlab-ci.yml
@@ -13,7 +13,8 @@ stages:
     - release
 
 before_script:
-    - echo "${CI_REGISTRY_PASSWORD}" | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY}
+    - echo "${CI_JOB_TOKEN}" | docker login ${CI_REGISTRY} -u ${CI_REGISTRY_USER} --password-stdin
+
 
 build:
     stage: build
-- 
GitLab