Install gawk as a replacement for mawk in Docker containers. (#30452) (…

…#30464) * Install gawk as a replacement for mawk in Docker containers. * Add changelog entry. (cherry picked from commit 2020a27) Co-authored-by: Blake Rouse <[email protected]>
elastic · Feb 24, 2022 · 3fcddb6 · 3fcddb6
1 parent 7292df6
commit 3fcddb6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -66,6 +66,8 @@ 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]
+
 
 *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
@@ -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
@@ -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; \
Original file line number	Diff line number	Diff line change
Expand Up		@@ -66,6 +66,8 @@ 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]


		Elastic Logging Plugin

Expand Down