From 5f6265d14698ff348cbe78d7ddad297074dd4e86 Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Fri, 21 Feb 2025 13:50:45 +0100 Subject: [PATCH] Fix x86 image after add automatic conan configuration --- conan-el6-gcc44-x86/Dockerfile | 2 +- conan-el7-gcc48/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile index 1d3661f..cc61b43 100644 --- a/conan-el6-gcc44-x86/Dockerfile +++ b/conan-el6-gcc44-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"] \ No newline at end of file diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile index 523e307..b0d1138 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 && \"$@\"", "-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"] -- GitLab