diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile index 7531560ce495e47c32857f6d116c99ade11d8bd0..f9d9825f6e17c9ececad7a84ba84cf4839edc4a4 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 e0678d41f8d64574fb17cb40827e030ce439482d..062c2be62b770e1bc5ba65f2382456ee116fc72a 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 3a27e4ea8d905eb9b2329eda3b4bf005fa7b44bf..f23d1eef32a03bc2845d799a7ec142c88e40af77 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 c3e4c866181797ef0a546efc635fa20b2292d7a8..94a6c19755c520b1ca4a9559f405a5bcb1b38e40 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 4bafe6c6278b0123ce9f3dd409787bb38952ce80..5b1f12ee24fb40384e68454508dbd71e18cbadd6 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 dc4f9290cd7da442bf5e5f249485ce852511c3e1..9f380a469e2839cc73a0af9060245af8b892e2c9 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 e66b81e639792356f8b6a4d0d38b5255c9d58c7e..b0adcd129e7b35ca4e12ad99dd84680e912fa356 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 dc93d333e204e8679256dbb16c45406fd66fe9dd..58c5c5ed263cc50c9ba760736e46c7d22171b105 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