From 611dd92323f8ba1f7b82f88466818de749ef481b Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 24 Feb 2022 11:02:03 -0500 Subject: [PATCH] Install gawk as a replacement for mawk in Docker containers. (#30452) (#30465) * Install gawk as a replacement for mawk in Docker containers. * Add changelog entry. (cherry picked from commit 2020a27d87117b18d0ab997c45d8856637a24559) Co-authored-by: Blake Rouse --- CHANGELOG.next.asciidoc | 2 +- .../packaging/templates/docker/Dockerfile.elastic-agent.tmpl | 2 +- dev-tools/packaging/templates/docker/Dockerfile.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 49ce59e53163..31296d9c2a69 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -74,7 +74,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d *Functionbeat* -- Pass AWS region configuration correctly. {issue}28520[28520] {pull}30238[30238] +- Pass AWS region configuration correctly. {issue}28520[28520] {pull}30238[30238] *Elastic Logging Plugin* diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl index 31ca7e78da2f..f4e31cd3b015 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl @@ -37,7 +37,7 @@ RUN for iter in {1..10}; do microdnf update -y && microdnf install -y findutils RUN for iter in {1..10}; do \ apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes ca-certificates curl libcap2-bin xz-utils && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes ca-certificates curl gawk libcap2-bin xz-utils && \ apt-get clean all && \ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \ done; \ diff --git a/dev-tools/packaging/templates/docker/Dockerfile.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.tmpl index fec54d5ccb11..ac05bebd48e8 100644 --- a/dev-tools/packaging/templates/docker/Dockerfile.tmpl +++ b/dev-tools/packaging/templates/docker/Dockerfile.tmpl @@ -27,7 +27,7 @@ RUN microdnf -y update && \ {{- else }} RUN for iter in {1..10}; do \ apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes ca-certificates curl libcap2-bin xz-utils && \ + DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes ca-certificates curl gawk libcap2-bin xz-utils && \ apt-get clean all && \ exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \ done; \