From da8c90fedbd904f2351035b1abb18e4509e097aa Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Fri, 21 Feb 2025 14:53:08 +0100 Subject: [PATCH] Fix inversion between linux32 for el7 --- conan-el7-gcc48-x86/Dockerfile | 2 +- conan-el7-gcc48/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile index 3556285..7b50c1a 100755 --- a/conan-el7-gcc48-x86/Dockerfile +++ b/conan-el7-gcc48-x86/Dockerfile @@ -62,7 +62,7 @@ WORKDIR /home/conan RUN mkdir -p /home/conan/.conan # Enable conan configuration -ENTRYPOINT ["bash", "-c" ,"conan config install --verify-ssl false --type git https://gitlab.synchrotron-soleil.fr/software-control-system/factory/conan/conan2-config.git && \"$@\"", "-s"] +ENTRYPOINT ["bash", "-c" ,"conan config install --verify-ssl false --type git https://gitlab.synchrotron-soleil.fr/software-control-system/factory/conan/conan2-config.git && linux32 -- \"$@\"", "-s"] # Lauch interactive shell by default CMD ["bash"] diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile index b0d1138..523e307 100755 --- a/conan-el7-gcc48/Dockerfile +++ b/conan-el7-gcc48/Dockerfile @@ -61,7 +61,7 @@ WORKDIR /home/conan RUN mkdir -p /home/conan/.conan # Enable conan configuration -ENTRYPOINT ["bash", "-c" ,"conan config install --verify-ssl false --type git https://gitlab.synchrotron-soleil.fr/software-control-system/factory/conan/conan2-config.git && linux32 -- \"$@\"", "-s"] +ENTRYPOINT ["bash", "-c" ,"conan config install --verify-ssl false --type git https://gitlab.synchrotron-soleil.fr/software-control-system/factory/conan/conan2-config.git && \"$@\"", "-s"] # Lauch interactive shell by default CMD ["bash"] -- GitLab