From 766293eb1d9b1971871314b82f735f0b65db2a44 Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Tue, 11 Oct 2022 11:42:33 +0200
Subject: [PATCH] Update docker image and fix download path

---
 .gitlab-ci.yml | 26 +++++++++++++-------------
 README.md      | 16 ++++++++--------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4457d49..fda6486 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,13 +38,13 @@ stages:
 
 linux-el6-x86_64:
   extends: [".build"]
-  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44
   variables:
     NAME: "git-${GIT_VERSION}-linux-el6-x86_64"
 
 test-el6-x86_64:
   extends: [".test"]
-  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44
   variables:
     NAME: "git-${GIT_VERSION}-linux-el6-x86_64"
   needs:
@@ -52,7 +52,7 @@ test-el6-x86_64:
 
 package-el6-x86_64:
   extends: [".package"]
-  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44
   variables:
     NAME: "git-${GIT_VERSION}-linux-el6-x86_64"
   needs:
@@ -61,13 +61,13 @@ package-el6-x86_64:
 
 linux-el6-i686:
   extends: [".build"]
-  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86
   variables:
     NAME: "git-${GIT_VERSION}-linux-el6-i686"
 
 test-el6-i686:
   extends: [".test"]
-  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86
   variables:
     NAME: "git-${GIT_VERSION}-linux-el6-i686"
   needs:
@@ -75,7 +75,7 @@ test-el6-i686:
 
 package-el6-i686:
   extends: [".package"]
-  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86
   variables:
     NAME: "git-${GIT_VERSION}-linux-el6-i686"
   needs:
@@ -84,13 +84,13 @@ package-el6-i686:
 
 linux-el7-x86_64:
   extends: [".build"]
-  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48
   variables:
     NAME: "git-${GIT_VERSION}-linux-el7-x86_64"
 
 test-el7-x86_64:
   extends: [".test"]
-  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48
   variables:
     NAME: "git-${GIT_VERSION}-linux-el7-x86_64"
   needs:
@@ -98,7 +98,7 @@ test-el7-x86_64:
 
 package-el7-x86_64:
   extends: [".package"]
-  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86
   variables:
     NAME: "git-${GIT_VERSION}-linux-el7-x86_64"
   needs:
@@ -107,14 +107,14 @@ package-el7-x86_64:
 
 linux-el7-i686:
   extends: [".build"]
-  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48-x86
   variables:
     NAME: "git-${GIT_VERSION}-linux-el7-i686"
     GIT_ROOT: "${CI_PROJECT_DIR}/${NAME}"
 
 test-el7-i686:
   extends: [".test"]
-  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48-x86
   variables:
     NAME: "git-${GIT_VERSION}-linux-el7-i686"
   needs:
@@ -122,9 +122,9 @@ test-el7-i686:
 
 package-el7-i686:
   extends: [".package"]
-  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
+  image: gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48-x86
   variables:
     NAME: "git-${GIT_VERSION}-linux-el7-i686"
   needs:
     - linux-el7-i686
-    - test-el7-i686
\ No newline at end of file
+    - test-el7-i686
diff --git a/README.md b/README.md
index 2096499..285c081 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,13 @@
 Pipeline to build Git 2.36.2 for our legacy CentOS platform.
 
 Allows to build Git for:
-* CentOS 6.10 64 bits: [git-2.36.2-linux-el6-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/git/-/jobs/artifacts/main/download?job=linux-el6-x86_64)
-* CentOS 6.10 32 bits: [git-2.36.2-linux-el6-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/git/-/jobs/artifacts/main/download?job=linux-el6-i686)
-* CentOS 7.9 64 bits: [git-2.36.2-linux-el7-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/git/-/jobs/artifacts/main/download?job=linux-el7-x86_64)
-* CentOS 7.9 32 bits: [git-2.36.2-linux-el7-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/tools/git/-/jobs/artifacts/main/download?job=linux-el7-i686)
+* CentOS 6.10 64 bits: [git-2.36.2-linux-el6-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/main/download?job=linux-el6-x86_64)
+* CentOS 6.10 32 bits: [git-2.36.2-linux-el6-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/main/download?job=linux-el6-i686)
+* CentOS 7.9 64 bits: [git-2.36.2-linux-el7-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/main/download?job=linux-el7-x86_64)
+* CentOS 7.9 32 bits: [git-2.36.2-linux-el7-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/main/download?job=linux-el7-i686)
 
 Build on Docker image:
-* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44
-* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el6-gcc44-x86
-* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48
-* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-el7-gcc48-x86
+* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44
+* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el6-gcc44-x86
+* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48
+* gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el7-gcc48-x86
-- 
GitLab