From 447c6ffb549e0878da7a54f68063ec92d6105793 Mon Sep 17 00:00:00 2001 From: Seregy Bukharov Date: Mon, 11 Jan 2021 17:18:14 +0300 Subject: [PATCH 1/3] Pin jq version --- Dockerfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5d287dc..bcd5954 100644 --- a/Dockerfile +++ b/Dockerfile @@ -91,7 +91,7 @@ RUN dnf config-manager \ ## docker-compose for dind RUN pip install docker-compose -## packer (hashicorp-packer) +## packer (hashicorp-packer) ## https://github.com/hashicorp/packer/releases ## issue: https://github.com/cracklib/cracklib/issues/7 RUN packer_version=1.6.5 \ @@ -115,6 +115,13 @@ RUN werf_version=1.2.2+fix4 \ && chmod +x /tmp/werf \ && mv /tmp/werf /usr/local/bin/werf +## https://stedolan.github.io/jq/download/ +RUN jq_version=1.6 \ + && curl -L https://github.com/stedolan/jq/releases/download/jq-${jq_version}/jq-linux64 -o /tmp/jq \ + && chmod +x /tmp/jq \ + && mv /tmp/jq /usr/local/bin/jq + + ## promtool from prometheus ## https://github.com/prometheus/prometheus/releases RUN cd /tmp/ \ From 4342911d7c5e7436ee34b465d532d68beaf93817 Mon Sep 17 00:00:00 2001 From: Seregy Bukharov Date: Mon, 11 Jan 2021 17:19:07 +0300 Subject: [PATCH 2/3] Add comment --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index bcd5954..06e8233 100644 --- a/Dockerfile +++ b/Dockerfile @@ -115,6 +115,7 @@ RUN werf_version=1.2.2+fix4 \ && chmod +x /tmp/werf \ && mv /tmp/werf /usr/local/bin/werf +## jq ## https://stedolan.github.io/jq/download/ RUN jq_version=1.6 \ && curl -L https://github.com/stedolan/jq/releases/download/jq-${jq_version}/jq-linux64 -o /tmp/jq \ From b32fc6776885a53e3f729a9d3ee864cc729b8b8d Mon Sep 17 00:00:00 2001 From: Seregy Bukharov Date: Mon, 11 Jan 2021 17:39:37 +0300 Subject: [PATCH 3/3] Remove old jq installation --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 06e8233..648e53a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ COPY --from=redis_builder /workdir/redis-stable/src/redis-cli /usr/local/bin/ COPY --from=ghost_builder /go/gh-ost/bin/gh-ost /usr/local/bin/ RUN dnf install -y epel-release \ - && dnf install -y python38 python38-devel jq unzip git strace htop \ + && dnf install -y python38 python38-devel unzip git strace htop \ && dnf install -y 'dnf-command(config-manager)' \ && dnf clean all \ && alternatives --set python /usr/bin/python3 \