From 3a97358f30a72415360606dac698da0822ed8438 Mon Sep 17 00:00:00 2001 From: decentral1se Date: Sat, 5 Jun 2021 08:51:10 +0200 Subject: [PATCH] Vendor later versions of jq/yq --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index d7e99db..9b534ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,12 +5,10 @@ RUN apk add --upgrade --no-cache \ curl \ git \ grep \ - jq \ openssh-client \ py3-requests \ skopeo \ - util-linux \ - yq + util-linux RUN mkdir -p ~./local/bin RUN mkdir -p ~/.abra/apps @@ -19,8 +17,11 @@ RUN mkdir -p ~/.ssh/ RUN ssh-keyscan -p 2222 git.autonomic.zone > ~/.ssh/known_hosts -RUN ln -sf /usr/bin/jq ~/.abra/vendor -RUN ln -sf /usr/bin/yq ~/.abra/vendor +RUN curl -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 --output ~/.abra/vendor/jq +RUN chmod +x ~/.abra/vendor/jq + +RUN curl -L https://github.com/mikefarah/yq/releases/download/v4.9.3/yq_linux_amd64 --output ~/.abra/vendor/yq +RUN chmod +x ~/.abra/vendor/yq # Note(decentral1se): it is fine to always use the development branch because # our Drone CI docker auto-tagger will publish official release tags and