From c300074521862c6f306e6c3e8ea9428e7a6a48b3 Mon Sep 17 00:00:00 2001 From: Michal Pristas Date: Mon, 11 May 2020 17:40:31 +0200 Subject: [PATCH] [Elastic Agent] Fix jq: command not found (#18408) * install jq in separate steps * changelog * move up * comment * embarrasing commit * tidy * Update dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl Co-authored-by: Blake Rouse Co-authored-by: Blake Rouse --- .../packaging/templates/docker/Dockerfile.elastic-agent.tmpl | 4 +++- x-pack/elastic-agent/CHANGELOG.asciidoc | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl index 609cc69359ee..52b0870d7193 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl @@ -4,8 +4,10 @@ FROM {{ .from }} +# Installing jq needs to be installed after epel-release and cannot be in the same yum install command. RUN yum -y --setopt=tsflags=nodocs update && \ - yum install -y epel-release jq \ + yum install epel-release -y && \ + yum install jq -y && \ yum clean all LABEL \ diff --git a/x-pack/elastic-agent/CHANGELOG.asciidoc b/x-pack/elastic-agent/CHANGELOG.asciidoc index b2320dea85ad..a38beab5118f 100644 --- a/x-pack/elastic-agent/CHANGELOG.asciidoc +++ b/x-pack/elastic-agent/CHANGELOG.asciidoc @@ -34,6 +34,7 @@ - Fix an issue where the checkin_frequency, jitter, and backoff options where not configurable. {pull}17843[17843] - Ensure that the beats uses the params prefer_v2_templates on bulk request. {pull}18318[18318] - Stop monitoring on config change {pull}18284[18284] +- Fix jq: command not found {pull}18408[18408] ==== New features