Skip to content
Snippets Groups Projects
Commit fb38e7c0 authored by Patrick MADELA's avatar Patrick MADELA
Browse files

Force to use linux 32 when using docker exec ... sh -c "..."

parent e0f22a43
Branches
Tags 1.55.0
No related merge requests found
Pipeline #1739 passed
Stage: triggers
Pipeline: conan-docker-tools

#1755

    Pipeline: conan-docker-tools

    #1754

      Pipeline: conan-docker-tools

      #1753

        +13
        Show whitespace changes
        Inline Side-by-side
        Showing
        with 16 additions and 16 deletions
        conan-el6-gcc44-x86/Dockerfile
        + 2
        − 2
        View file @ fb38e7c0
        ...@@ -45,9 +45,9 @@ RUN groupadd 1001 -g 1001 \ ...@@ -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 \ && 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} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \ && 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 \ && 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 && chmod +x /bin/sh
        USER conan USER conan
        ......
        conan-el6-gcc73-x86/Dockerfile
        + 2
        − 2
        View file @ fb38e7c0
        ...@@ -45,9 +45,9 @@ RUN groupadd 1001 -g 1001 \ ...@@ -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 \ && 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} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \ && 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 \ && 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 && chmod +x /bin/sh
        USER conan USER conan
        ......
        conan-el6-gcc83-x86/Dockerfile
        + 2
        − 2
        View file @ fb38e7c0
        ...@@ -45,9 +45,9 @@ RUN groupadd 1001 -g 1001 \ ...@@ -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 \ && 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} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \ && 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 \ && 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 && chmod +x /bin/sh
        USER conan USER conan
        ......
        conan-el6-gcc91-x86/Dockerfile
        + 2
        − 2
        View file @ fb38e7c0
        ...@@ -45,9 +45,9 @@ RUN groupadd 1001 -g 1001 \ ...@@ -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 \ && 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} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \ && 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 \ && 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 && chmod +x /bin/sh
        USER conan USER conan
        ......
        conan-el7-gcc48-x86/Dockerfile
        + 2
        − 2
        View file @ fb38e7c0
        ...@@ -45,9 +45,9 @@ RUN groupadd g1001 -g 1001 \ ...@@ -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 \ && 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} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \ && 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 \ && 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 && chmod +x /bin/sh
        USER conan USER conan
        ......
        conan-el7-gcc73-x86/Dockerfile
        + 2
        − 2
        View file @ fb38e7c0
        ...@@ -45,9 +45,9 @@ RUN groupadd g1001 -g 1001 \ ...@@ -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 \ && 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} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \ && 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 \ && 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 && chmod +x /bin/sh
        USER conan USER conan
        ......
        conan-el7-gcc82-x86/Dockerfile
        + 2
        − 2
        View file @ fb38e7c0
        ...@@ -45,9 +45,9 @@ RUN groupadd g1001 -g 1001 \ ...@@ -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 \ && 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} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \ && 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 \ && 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 && chmod +x /bin/sh
        USER conan USER conan
        ......
        conan-el7-gcc93-x86/Dockerfile
        + 2
        − 2
        View file @ fb38e7c0
        ...@@ -45,9 +45,9 @@ RUN groupadd g1001 -g 1001 \ ...@@ -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 \ && 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} \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
        && rm ${CONAN_ROOT}.zip \ && 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 \ && 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 && chmod +x /bin/sh
        USER conan USER conan
        ......
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment

        The place to be for your source code