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

Fix update to jq 1.7.1

parent f65369d1
Branches main
No related tags found
No related merge requests found
Pipeline #6314 passed
Stage: triggers
Pipeline: conan-docker-tools

#6323

    Pipeline: conan-docker-tools

    #6322

      Pipeline: conan-docker-tools

      #6321

        +6
        Show whitespace changes
        Inline Side-by-side
        Showing
        with 9 additions and 9 deletions
        conan-el6-gcc44-x86/Dockerfile
        + 1
        − 1
        View file @ 70e37d7c
        ...@@ -47,7 +47,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -47,7 +47,7 @@ RUN groupadd 1001 -g 1001 \
        && rm ${CONAN_ROOT}.zip \ && rm ${CONAN_ROOT}.zip \
        # Install other tools # Install other tools
        && mkdir ${DEVTOOLS_ROOT}/bin \ && mkdir ${DEVTOOLS_ROOT}/bin \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux32 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-i386 \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
        && chmod +x ${DEVTOOLS_ROOT}/bin/* \ && chmod +x ${DEVTOOLS_ROOT}/bin/* \
        # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
        ......
        conan-el6-gcc44/Dockerfile
        + 1
        − 1
        View file @ 70e37d7c
        ...@@ -47,7 +47,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -47,7 +47,7 @@ RUN groupadd 1001 -g 1001 \
        && rm ${CONAN_ROOT}.zip \ && rm ${CONAN_ROOT}.zip \
        # Install other tools # Install other tools
        && mkdir ${DEVTOOLS_ROOT}/bin \ && mkdir ${DEVTOOLS_ROOT}/bin \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64 \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
        && chmod +x ${DEVTOOLS_ROOT}/bin/* && chmod +x ${DEVTOOLS_ROOT}/bin/*
        ......
        conan-el6-gcc91-x86/Dockerfile
        + 1
        − 1
        View file @ 70e37d7c
        ...@@ -47,7 +47,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -47,7 +47,7 @@ RUN groupadd 1001 -g 1001 \
        && rm ${CONAN_ROOT}.zip \ && rm ${CONAN_ROOT}.zip \
        # Install other tools # Install other tools
        && mkdir ${DEVTOOLS_ROOT}/bin \ && mkdir ${DEVTOOLS_ROOT}/bin \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux32 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-i386 \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
        && chmod +x ${DEVTOOLS_ROOT}/bin/* \ && chmod +x ${DEVTOOLS_ROOT}/bin/* \
        # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
        ......
        conan-el6-gcc91/Dockerfile
        + 1
        − 1
        View file @ 70e37d7c
        ...@@ -47,7 +47,7 @@ RUN groupadd 1001 -g 1001 \ ...@@ -47,7 +47,7 @@ RUN groupadd 1001 -g 1001 \
        && rm ${CONAN_ROOT}.zip \ && rm ${CONAN_ROOT}.zip \
        # Install other tools # Install other tools
        && mkdir ${DEVTOOLS_ROOT}/bin \ && mkdir ${DEVTOOLS_ROOT}/bin \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64 \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
        && chmod +x ${DEVTOOLS_ROOT}/bin/* && chmod +x ${DEVTOOLS_ROOT}/bin/*
        ......
        conan-el7-gcc48-x86/Dockerfile
        + 1
        − 1
        View file @ 70e37d7c
        ...@@ -47,7 +47,7 @@ RUN groupadd g1001 -g 1001 \ ...@@ -47,7 +47,7 @@ RUN groupadd g1001 -g 1001 \
        && rm ${CONAN_ROOT}.zip \ && rm ${CONAN_ROOT}.zip \
        # Install other tools # Install other tools
        && mkdir ${DEVTOOLS_ROOT}/bin \ && mkdir ${DEVTOOLS_ROOT}/bin \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux32 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-i386 \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
        && chmod +x ${DEVTOOLS_ROOT}/bin/* \ && chmod +x ${DEVTOOLS_ROOT}/bin/* \
        # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
        ......
        conan-el7-gcc48/Dockerfile
        + 1
        − 1
        View file @ 70e37d7c
        ...@@ -50,7 +50,7 @@ RUN groupadd g1001 -g 1001 \ ...@@ -50,7 +50,7 @@ RUN groupadd g1001 -g 1001 \
        && rm ${CONAN_ROOT}.zip \ && rm ${CONAN_ROOT}.zip \
        # Install other tools # Install other tools
        && mkdir ${DEVTOOLS_ROOT}/bin \ && mkdir ${DEVTOOLS_ROOT}/bin \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64 \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
        && chmod +x ${DEVTOOLS_ROOT}/bin/* && chmod +x ${DEVTOOLS_ROOT}/bin/*
        ......
        conan-el7-gcc93-x86/Dockerfile
        + 1
        − 1
        View file @ 70e37d7c
        ...@@ -47,7 +47,7 @@ RUN groupadd g1001 -g 1001 \ ...@@ -47,7 +47,7 @@ RUN groupadd g1001 -g 1001 \
        && rm ${CONAN_ROOT}.zip \ && rm ${CONAN_ROOT}.zip \
        # Install other tools # Install other tools
        && mkdir ${DEVTOOLS_ROOT}/bin \ && mkdir ${DEVTOOLS_ROOT}/bin \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux32 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-i386 \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_386 \
        && chmod +x ${DEVTOOLS_ROOT}/bin/* \ && chmod +x ${DEVTOOLS_ROOT}/bin/* \
        # Force to use linux32 when Jenkins uses docker exec ... sh -c "..." # Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
        ......
        conan-el7-gcc93/Dockerfile
        + 1
        − 1
        View file @ 70e37d7c
        ...@@ -50,7 +50,7 @@ RUN groupadd g1001 -g 1001 \ ...@@ -50,7 +50,7 @@ RUN groupadd g1001 -g 1001 \
        && rm ${CONAN_ROOT}.zip \ && rm ${CONAN_ROOT}.zip \
        # Install other tools # Install other tools
        && mkdir ${DEVTOOLS_ROOT}/bin \ && mkdir ${DEVTOOLS_ROOT}/bin \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64 \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
        && chmod +x ${DEVTOOLS_ROOT}/bin/* && chmod +x ${DEVTOOLS_ROOT}/bin/*
        ......
        conan-el9-gcc114/Dockerfile
        + 1
        − 1
        View file @ 70e37d7c
        ...@@ -50,7 +50,7 @@ RUN groupadd g1001 -g 1001 \ ...@@ -50,7 +50,7 @@ RUN groupadd g1001 -g 1001 \
        && rm ${CONAN_ROOT}.zip \ && rm ${CONAN_ROOT}.zip \
        # Install other tools # Install other tools
        && mkdir ${DEVTOOLS_ROOT}/bin \ && mkdir ${DEVTOOLS_ROOT}/bin \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-amd64 \
        && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \ && curl -s -L -o ${DEVTOOLS_ROOT}/bin/yq https://github.com/mikefarah/yq/releases/download/v4.34.2/yq_linux_amd64 \
        && chmod +x ${DEVTOOLS_ROOT}/bin/* && chmod +x ${DEVTOOLS_ROOT}/bin/*
        ......
        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