From 70e37d7cc21ef5b0c958ccc3bf92c61f15f2c2ad Mon Sep 17 00:00:00 2001
From: Patrick Madela <patrick.madela@synchrotron-soleil.fr>
Date: Mon, 10 Feb 2025 14:49:53 +0100
Subject: [PATCH] Fix update to jq 1.7.1
---
conan-el6-gcc44-x86/Dockerfile | 2 +-
conan-el6-gcc44/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-gcc93-x86/Dockerfile | 2 +-
conan-el7-gcc93/Dockerfile | 2 +-
conan-el9-gcc114/Dockerfile | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile
index 1413461..f1b5a07 100644
--- a/conan-el6-gcc44-x86/Dockerfile
+++ b/conan-el6-gcc44-x86/Dockerfile
@@ -47,7 +47,7 @@ RUN groupadd 1001 -g 1001 \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
&& mkdir ${DEVTOOLS_ROOT}/bin \
- && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux32 \
+ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-i386 \
&& curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
&& chmod +x ${DEVTOOLS_ROOT}/bin/* \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile
index 2e6fd92..ae80769 100644
--- a/conan-el6-gcc44/Dockerfile
+++ b/conan-el6-gcc44/Dockerfile
@@ -47,7 +47,7 @@ RUN groupadd 1001 -g 1001 \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
&& mkdir ${DEVTOOLS_ROOT}/bin \
- && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64 \
+ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64 \
&& curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
&& chmod +x ${DEVTOOLS_ROOT}/bin/*
diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile
index 2b8aae2..24616b2 100755
--- a/conan-el6-gcc91-x86/Dockerfile
+++ b/conan-el6-gcc91-x86/Dockerfile
@@ -47,7 +47,7 @@ RUN groupadd 1001 -g 1001 \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
&& mkdir ${DEVTOOLS_ROOT}/bin \
- && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux32 \
+ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-i386 \
&& curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
&& chmod +x ${DEVTOOLS_ROOT}/bin/* \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile
index 2d7e1d4..96e65d5 100755
--- a/conan-el6-gcc91/Dockerfile
+++ b/conan-el6-gcc91/Dockerfile
@@ -47,7 +47,7 @@ RUN groupadd 1001 -g 1001 \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
&& mkdir ${DEVTOOLS_ROOT}/bin \
- && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64 \
+ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64 \
&& curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
&& chmod +x ${DEVTOOLS_ROOT}/bin/*
diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile
index d77fce1..16bf1a8 100755
--- a/conan-el7-gcc48-x86/Dockerfile
+++ b/conan-el7-gcc48-x86/Dockerfile
@@ -47,7 +47,7 @@ RUN groupadd g1001 -g 1001 \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
&& mkdir ${DEVTOOLS_ROOT}/bin \
- && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux32 \
+ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-i386 \
&& curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
&& chmod +x ${DEVTOOLS_ROOT}/bin/* \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile
index 8bc27a8..97630a1 100755
--- a/conan-el7-gcc48/Dockerfile
+++ b/conan-el7-gcc48/Dockerfile
@@ -50,7 +50,7 @@ RUN groupadd g1001 -g 1001 \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
&& mkdir ${DEVTOOLS_ROOT}/bin \
- && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64 \
+ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64 \
&& curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
&& chmod +x ${DEVTOOLS_ROOT}/bin/*
diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile
index 57dcea7..740e317 100755
--- a/conan-el7-gcc93-x86/Dockerfile
+++ b/conan-el7-gcc93-x86/Dockerfile
@@ -47,7 +47,7 @@ RUN groupadd g1001 -g 1001 \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
&& mkdir ${DEVTOOLS_ROOT}/bin \
- && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux32 \
+ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-i386 \
&& curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
&& chmod +x ${DEVTOOLS_ROOT}/bin/* \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile
index 82ce515..b705389 100755
--- a/conan-el7-gcc93/Dockerfile
+++ b/conan-el7-gcc93/Dockerfile
@@ -50,7 +50,7 @@ RUN groupadd g1001 -g 1001 \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
&& mkdir ${DEVTOOLS_ROOT}/bin \
- && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64 \
+ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64 \
&& curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
&& chmod +x ${DEVTOOLS_ROOT}/bin/*
diff --git a/conan-el9-gcc114/Dockerfile b/conan-el9-gcc114/Dockerfile
index d7b1c68..edc3196 100644
--- a/conan-el9-gcc114/Dockerfile
+++ b/conan-el9-gcc114/Dockerfile
@@ -50,7 +50,7 @@ RUN groupadd g1001 -g 1001 \
&& rm ${CONAN_ROOT}.zip \
# Install other tools
&& mkdir ${DEVTOOLS_ROOT}/bin \
- && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64 \
+ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64 \
&& curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
&& chmod +x ${DEVTOOLS_ROOT}/bin/*
--
GitLab