From a44d4fe920875d21043329c813be91744fb8079d Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 21 Oct 2021 19:08:45 -0500
Subject: [PATCH] [Heartbeat] Only setuid in elastic-agent image (#28577)
 (#28592)

Fixes #28572 by only invoking setuid in the elastic-agent container, and
no longer in the heartbeat container. See the linked issue for details.

(cherry picked from commit da2bc892fe5460a50284c37c538618e7a6b8117c)

Co-authored-by: Andrew Cholakian <andrew@andrewvc.com>
---
 dev-tools/packaging/templates/docker/Dockerfile.tmpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-tools/packaging/templates/docker/Dockerfile.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.tmpl
index e90605179472..ae3e4cf91002 100644
--- a/dev-tools/packaging/templates/docker/Dockerfile.tmpl
+++ b/dev-tools/packaging/templates/docker/Dockerfile.tmpl
@@ -132,7 +132,6 @@ USER {{ .user }}
 {{- if (and (eq .BeatName "heartbeat") (not (contains .from "ubi-minimal")))  }}
 # Setup synthetics env vars
 ENV ELASTIC_SYNTHETICS_CAPABLE=true
-ENV BEAT_SETUID_AS={{ .user }}
 ENV SUITES_DIR={{ $beatHome }}/suites
 ENV NODE_VERSION=14.17.5
 ENV PATH="$NODE_PATH/node/bin:$PATH"