From e482dd3a55d82e90ae648af72107aa98695d39fe Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 20 Jul 2021 16:52:42 +0200
Subject: [PATCH] [7.13.x](backport #1336) fix: apply container name to
 elastic-agent Docker services (#1339)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: apply container name to elastic-agent Docker services (#1336)

* fix: apply container name to elastic-agent Docker services

* chore: do not override container name for elastic-agent

(cherry picked from commit 787b976b0bac2d44f256eab681ee4bc189a41406)

# Conflicts:
#	cli/config/compose/services/elastic-agent/cloud/docker-compose.yml
#	cli/config/compose/services/elastic-agent/docker-compose.yml

* fix: resolve conflicts

Co-authored-by: Manuel de la Peña <mdelapenya@gmail.com>
---
 .../compose/services/elastic-agent/centos/docker-compose.yml     | 1 -
 .../compose/services/elastic-agent/cloud/docker-compose.yml      | 1 -
 .../compose/services/elastic-agent/debian/docker-compose.yml     | 1 -
 cli/config/compose/services/elastic-agent/docker-compose.yml     | 1 -
 e2e/_suites/fleet/stand-alone.go                                 | 1 -
 5 files changed, 5 deletions(-)

diff --git a/cli/config/compose/services/elastic-agent/centos/docker-compose.yml b/cli/config/compose/services/elastic-agent/centos/docker-compose.yml
index 21bb17417c..e229ced5e1 100644
--- a/cli/config/compose/services/elastic-agent/centos/docker-compose.yml
+++ b/cli/config/compose/services/elastic-agent/centos/docker-compose.yml
@@ -2,7 +2,6 @@ version: '2.4'
 services:
   elastic-agent:
     image: docker.elastic.co/observability-ci/centos-systemd:latest
-    container_name: ${centos_systemdContainerName}
     entrypoint: "/usr/sbin/init"
     platform: ${stackPlatform:-linux/amd64}
     privileged: true
diff --git a/cli/config/compose/services/elastic-agent/cloud/docker-compose.yml b/cli/config/compose/services/elastic-agent/cloud/docker-compose.yml
index a1f62987ee..c5e36e85dc 100644
--- a/cli/config/compose/services/elastic-agent/cloud/docker-compose.yml
+++ b/cli/config/compose/services/elastic-agent/cloud/docker-compose.yml
@@ -2,7 +2,6 @@ version: '2.4'
 services:
   elastic-agent:
     image: docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-8.0.0-SNAPSHOT}
-    container_name:  ${elasticAgentContainerName}
     depends_on:
       elasticsearch:
         condition: service_healthy
diff --git a/cli/config/compose/services/elastic-agent/debian/docker-compose.yml b/cli/config/compose/services/elastic-agent/debian/docker-compose.yml
index 0aff8b7b27..7fce9ae5a9 100644
--- a/cli/config/compose/services/elastic-agent/debian/docker-compose.yml
+++ b/cli/config/compose/services/elastic-agent/debian/docker-compose.yml
@@ -2,7 +2,6 @@ version: '2.4'
 services:
   elastic-agent:
     image: docker.elastic.co/observability-ci/debian-systemd:latest
-    container_name: ${debian_systemdContainerName} 
     entrypoint: "/sbin/init"
     platform: ${stackPlatform:-linux/amd64}
     privileged: true
diff --git a/cli/config/compose/services/elastic-agent/docker-compose.yml b/cli/config/compose/services/elastic-agent/docker-compose.yml
index a1ba9ef9e8..e353ca8dff 100644
--- a/cli/config/compose/services/elastic-agent/docker-compose.yml
+++ b/cli/config/compose/services/elastic-agent/docker-compose.yml
@@ -2,7 +2,6 @@ version: '2.4'
 services:
   elastic-agent:
     image: docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.13.0-SNAPSHOT}
-    container_name: ${elasticAgentContainerName}
     depends_on:
       elasticsearch:
         condition: service_healthy
diff --git a/e2e/_suites/fleet/stand-alone.go b/e2e/_suites/fleet/stand-alone.go
index 565b47e4d0..1095b9b685 100644
--- a/e2e/_suites/fleet/stand-alone.go
+++ b/e2e/_suites/fleet/stand-alone.go
@@ -126,7 +126,6 @@ func (fts *FleetTestSuite) startStandAloneAgent(image string, flavour string, en
 
 	containerName := fmt.Sprintf("%s_%s_%d", common.FleetProfileName, common.ElasticAgentServiceName, 1)
 
-	common.ProfileEnv["elasticAgentContainerName"] = containerName
 	common.ProfileEnv["elasticAgentTag"] = dockerImageTag
 
 	for k, v := range env {