From fb38e7c08bad1921831f241486d946e8501dc7da Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Tue, 10 Jan 2023 23:19:56 +0100 Subject: [PATCH] Force to use linux 32 when using docker exec ... sh -c "..." --- conan-el6-gcc44-x86/Dockerfile | 4 ++-- conan-el6-gcc73-x86/Dockerfile | 4 ++-- conan-el6-gcc83-x86/Dockerfile | 4 ++-- conan-el6-gcc91-x86/Dockerfile | 4 ++-- conan-el7-gcc48-x86/Dockerfile | 4 ++-- conan-el7-gcc73-x86/Dockerfile | 4 ++-- conan-el7-gcc82-x86/Dockerfile | 4 ++-- conan-el7-gcc93-x86/Dockerfile | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile index 7531560..f9d9825 100644 --- a/conan-el6-gcc44-x86/Dockerfile +++ b/conan-el6-gcc44-x86/Dockerfile @@ -45,9 +45,9 @@ RUN groupadd 1001 -g 1001 \ && 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 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ - # Force to use linux 32 when using docker exec ... sh -c "..." + # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ - && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash -c "$@"' > /bin/sh \ + && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh USER conan diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile index e0678d4..062c2be 100755 --- a/conan-el6-gcc73-x86/Dockerfile +++ b/conan-el6-gcc73-x86/Dockerfile @@ -45,9 +45,9 @@ RUN groupadd 1001 -g 1001 \ && 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 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ - # Force to use linux 32 when using docker exec ... sh -c "..." + # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ - && echo -e '#!/bin/bash\nsource scl_source enable devtoolset-7 && /usr/bin/linux32 -- /bin/bash -c "$@" -s' > /bin/sh \ + && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh USER conan diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile index 3a27e4e..f23d1ee 100755 --- a/conan-el6-gcc83-x86/Dockerfile +++ b/conan-el6-gcc83-x86/Dockerfile @@ -45,9 +45,9 @@ RUN groupadd 1001 -g 1001 \ && 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 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ - # Force to use linux 32 when using docker exec ... sh -c "..." + # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ - && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash -c "$@"' > /bin/sh \ + && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh USER conan diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile index c3e4c86..94a6c19 100755 --- a/conan-el6-gcc91-x86/Dockerfile +++ b/conan-el6-gcc91-x86/Dockerfile @@ -45,9 +45,9 @@ RUN groupadd 1001 -g 1001 \ && 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 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ - # Force to use linux 32 when using docker exec ... sh -c "..." + # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ - && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash -c "$@"' > /bin/sh \ + && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh USER conan diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile index 4bafe6c..5b1f12e 100755 --- a/conan-el7-gcc48-x86/Dockerfile +++ b/conan-el7-gcc48-x86/Dockerfile @@ -45,9 +45,9 @@ RUN groupadd g1001 -g 1001 \ && 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 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ - # Force to use linux 32 when using docker exec ... sh -c "..." + # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ - && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash -c "$@"' > /bin/sh \ + && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh USER conan diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile index dc4f929..9f380a4 100755 --- a/conan-el7-gcc73-x86/Dockerfile +++ b/conan-el7-gcc73-x86/Dockerfile @@ -45,9 +45,9 @@ RUN groupadd g1001 -g 1001 \ && 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 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ - # Force to use linux 32 when using docker exec ... sh -c "..." + # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ - && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash -c "$@"' > /bin/sh \ + && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh USER conan diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile index e66b81e..b0adcd1 100755 --- a/conan-el7-gcc82-x86/Dockerfile +++ b/conan-el7-gcc82-x86/Dockerfile @@ -45,9 +45,9 @@ RUN groupadd g1001 -g 1001 \ && 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 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ - # Force to use linux 32 when using docker exec ... sh -c "..." + # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ - && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash -c "$@"' > /bin/sh \ + && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh USER conan diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile index dc93d33..58c5c5e 100755 --- a/conan-el7-gcc93-x86/Dockerfile +++ b/conan-el7-gcc93-x86/Dockerfile @@ -45,9 +45,9 @@ RUN groupadd g1001 -g 1001 \ && 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 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ - # Force to use linux 32 when using docker exec ... sh -c "..." + # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." && rm /bin/sh \ - && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash -c "$@"' > /bin/sh \ + && echo -e '#!/bin/bash\n/usr/bin/linux32 -- /bin/bash "$@"' > /bin/sh \ && chmod +x /bin/sh USER conan -- GitLab