From 685e35ec05180773716a861b3da6cbb954d0e401 Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Fri, 20 Jan 2023 11:51:50 +0100
Subject: [PATCH] Fix link to Conan archive with the correct version

---
 conan-el6-gcc44-x86/Dockerfile | 2 +-
 conan-el6-gcc44/Dockerfile     | 2 +-
 conan-el6-gcc73-x86/Dockerfile | 2 +-
 conan-el6-gcc73/Dockerfile     | 2 +-
 conan-el6-gcc83-x86/Dockerfile | 2 +-
 conan-el6-gcc83/Dockerfile     | 2 +-
 conan-el6-gcc91-x86/Dockerfile | 2 +-
 conan-el6-gcc91/Dockerfile     | 2 +-
 conan-el7-gcc48-x86/Dockerfile | 2 +-
 conan-el7-gcc48/Dockerfile     | 2 +-
 conan-el7-gcc73-x86/Dockerfile | 2 +-
 conan-el7-gcc73/Dockerfile     | 2 +-
 conan-el7-gcc82-x86/Dockerfile | 2 +-
 conan-el7-gcc83/Dockerfile     | 2 +-
 conan-el7-gcc93-x86/Dockerfile | 2 +-
 conan-el7-gcc93/Dockerfile     | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile
index 9de6132..50c630d 100644
--- a/conan-el6-gcc44-x86/Dockerfile
+++ b/conan-el6-gcc44-x86/Dockerfile
@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \
     && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CMAKE_ROOT}.zip \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-i686 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-i686 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip \
     # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile
index 5c9cc4a..754eae6 100644
--- a/conan-el6-gcc44/Dockerfile
+++ b/conan-el6-gcc44/Dockerfile
@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
         --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
         --exclude=share/vim \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-x86_64 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-x86_64 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip
 
diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile
index 3835c14..de7a990 100755
--- a/conan-el6-gcc73-x86/Dockerfile
+++ b/conan-el6-gcc73-x86/Dockerfile
@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \
     && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CMAKE_ROOT}.zip \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-i686 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-i686 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip \
     # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile
index caa3a6f..8348348 100755
--- a/conan-el6-gcc73/Dockerfile
+++ b/conan-el6-gcc73/Dockerfile
@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
         --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
         --exclude=share/vim \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-x86_64 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-x86_64 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip
 
diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile
index 8e03ddb..70d796a 100755
--- a/conan-el6-gcc83-x86/Dockerfile
+++ b/conan-el6-gcc83-x86/Dockerfile
@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \
     && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CMAKE_ROOT}.zip \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-i686 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-i686 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip \
     # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile
index 1671ad6..ed2f8fd 100755
--- a/conan-el6-gcc83/Dockerfile
+++ b/conan-el6-gcc83/Dockerfile
@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
         --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
         --exclude=share/vim \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-x86_64 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-x86_64 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip
 
diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile
index e496ad9..be0c6e1 100755
--- a/conan-el6-gcc91-x86/Dockerfile
+++ b/conan-el6-gcc91-x86/Dockerfile
@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \
     && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CMAKE_ROOT}.zip \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-i686 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-i686 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip \
     # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile
index 7472322..98de321 100755
--- a/conan-el6-gcc91/Dockerfile
+++ b/conan-el6-gcc91/Dockerfile
@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
         --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
         --exclude=share/vim \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-x86_64 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-x86_64 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip
 
diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile
index 263d052..47fa075 100755
--- a/conan-el7-gcc48-x86/Dockerfile
+++ b/conan-el7-gcc48-x86/Dockerfile
@@ -42,7 +42,7 @@ RUN groupadd g1001 -g 1001 \
     && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CMAKE_ROOT}.zip \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-i686 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-i686 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip \
     # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile
index 4d281e8..4dabc18 100755
--- a/conan-el7-gcc48/Dockerfile
+++ b/conan-el7-gcc48/Dockerfile
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
         --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
         --exclude=share/vim \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-x86_64 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-x86_64 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip
 
diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile
index 994dcb7..56aa294 100755
--- a/conan-el7-gcc73-x86/Dockerfile
+++ b/conan-el7-gcc73-x86/Dockerfile
@@ -42,7 +42,7 @@ RUN groupadd g1001 -g 1001 \
     && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CMAKE_ROOT}.zip \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-i686 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-i686 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip \
     # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile
index f3c3ecd..af75052 100755
--- a/conan-el7-gcc73/Dockerfile
+++ b/conan-el7-gcc73/Dockerfile
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
         --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
         --exclude=share/vim \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-x86_64 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-x86_64 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip
 
diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile
index 2cfd38a..4bb9800 100755
--- a/conan-el7-gcc82-x86/Dockerfile
+++ b/conan-el7-gcc82-x86/Dockerfile
@@ -42,7 +42,7 @@ RUN groupadd g1001 -g 1001 \
     && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CMAKE_ROOT}.zip \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-i686 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-i686 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip \
     # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile
index 1653437..d3f2125 100755
--- a/conan-el7-gcc83/Dockerfile
+++ b/conan-el7-gcc83/Dockerfile
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
         --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
         --exclude=share/vim \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-x86_64 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-x86_64 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip
 
diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile
index 46072fd..0e6de86 100755
--- a/conan-el7-gcc93-x86/Dockerfile
+++ b/conan-el7-gcc93-x86/Dockerfile
@@ -42,7 +42,7 @@ RUN groupadd g1001 -g 1001 \
     && unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CMAKE_ROOT}.zip \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-i686 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-i686 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip \
     # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile
index 2f698b5..3f37665 100755
--- a/conan-el7-gcc93/Dockerfile
+++ b/conan-el7-gcc93/Dockerfile
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
         --exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
         --exclude=share/vim \
     # Install conan
-    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-x86_64 \
+    && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/1.57.0/download?job=linux-x86_64 \
     && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
     && rm ${CONAN_ROOT}.zip
 
-- 
GitLab