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

Fix x86 image after add automatic conan configuration

parent c30e5e88
No related branches found
No related tags found
No related merge requests found
Pipeline #6737 failed
Pipeline: conan-docker-tools

#6749

    Pipeline: conan-docker-tools

    #6748

      Pipeline: conan-docker-tools

      #6747

        +9
        ......@@ -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
        ......@@ -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"]
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment