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 787b976) # Conflicts: # cli/config/compose/services/elastic-agent/cloud/docker-compose.yml # cli/config/compose/services/elastic-agent/docker-compose.yml
elastic · Jul 20, 2021 · 54cba72 · 54cba72
1 parent a272599
commit 54cba72
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 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
@@ -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
@@ -1,8 +1,12 @@
 version: '2.4'
 services:
   elastic-agent:
+<<<<<<< HEAD
     image: docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.14.0-SNAPSHOT}
     container_name:  ${elasticAgentContainerName}
+=======
+    image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-8.0.0-SNAPSHOT}"
+>>>>>>> 787b976 (fix: apply container name to elastic-agent Docker services (#1336))
     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
@@ -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
@@ -1,8 +1,12 @@
 version: '2.4'
 services:
   elastic-agent:
+<<<<<<< HEAD
     image: docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-7.14.0-SNAPSHOT}
     container_name: ${elasticAgentContainerName}
+=======
+    image: "docker.elastic.co/${elasticAgentDockerNamespace:-beats}/elastic-agent${elasticAgentDockerImageSuffix}:${elasticAgentTag:-8.0.0-SNAPSHOT}"
+>>>>>>> 787b976 (fix: apply container name to elastic-agent Docker services (#1336))
     depends_on:
       elasticsearch:
         condition: service_healthy

diff --git 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 {