From 4b148237b56592c868c72711594cdd65afa28401 Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Thu, 17 Feb 2022 08:47:36 -0500 Subject: [PATCH 1/2] Install gawk as a replacement for mawk in Docker containers. --- .../packaging/templates/docker/Dockerfile.elastic-agent.tmpl | 2 +- dev-tools/packaging/templates/docker/Dockerfile.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl index 31ca7e78da2..f4e31cd3b01 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 fec54d5ccb1..ac05bebd48e 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; \ From 1cd365cc0eefcf92b631b3e8cfb4c613d99b1871 Mon Sep 17 00:00:00 2001 From: Blake Rouse Date: Thu, 17 Feb 2022 09:10:08 -0500 Subject: [PATCH 2/2] Add changelog entry. --- CHANGELOG.next.asciidoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 08d1f908ed4..eba095ae45c 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -40,6 +40,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...main[Check the HEAD dif - Fix field names with `add_network_direction` processor. {issue}29747[29747] {pull}29751[29751] - Fix a logging bug when `ssl.verification_mode` was set to `full` or `certificate`, the command `test output` incorrectly logged that TLS was disabled. +- Fix the ability for subcommands to be ran properly from the beats containers. {pull}30452[30452] *Auditbeat* @@ -73,7 +74,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...main[Check the HEAD dif *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*