Remove support for Docker Compose v1

docs/howto/system_benchmarking.md

@@ -156,7 +156,6 @@ To use environment variables within the Terraform service deployer a `env.yml` f
 The file should be structured like this:
 
 ```yaml
-version: '2.3'
 services:
   terraform:
     environment:

docs/howto/system_testing.md

@@ -76,7 +76,6 @@ the log files from your package's integration service must be written to a volum
 the following definition in it's integration service's `docker-compose.yml` file.
 
 ```yaml
-version: '2.3'
 services:
   apache:
     # Other properties such as build, ports, etc.
@@ -95,7 +94,6 @@ For example docker images for MySQL include a volume for the data directory
 tests are executed, a volume can be added to the `docker-compose.yml`:
 
 ```yaml
-version: '2.3'
 services:
   mysql:
     # Other properties such as build, ports, etc.
@@ -118,7 +116,6 @@ This is useful if you need different capabilities than the provided by the
 
 `custom-agent.yml`
 ```yaml
-version: '2.3'
 services:
   docker-custom-agent:
     pid: host
@@ -131,7 +128,6 @@ services:
 This will result in an agent configuration such as:
 
 ```yaml
-version: '2.3'
 services:
   docker-custom-agent:
     hostname: docker-custom-agent
@@ -196,7 +192,6 @@ RUN apt-get update && apt-get -y install \
 ```
 An example for `custom-agent.yml` in multi-service setup is as below
 ```yaml
-version: '2.3'
 services:
   docker-custom-agent:
     build:
@@ -328,7 +323,6 @@ To use environment variables within the Terraform service deployer a `env.yml` f
 The file should be structured like this:
 
 ```yaml
-version: '2.3'
 services:
   terraform:
     environment:

internal/agentdeployer/_static/docker-agent-base.yml.tmpl

@@ -1,4 +1,3 @@
-version: "2.3"
 services:
   elastic-agent:
     hostname: ${AGENT_HOSTNAME}

internal/compose/compose.go

@@ -47,7 +47,6 @@ type Project struct {
 	name             string
 	composeFilePaths []string
 
-	dockerComposeV1                bool
 	dockerComposeStandalone        bool
 	disableANSI                    bool
 	disablePullProgressInformation bool
@@ -199,20 +198,15 @@ func NewProject(name string, paths ...string) (*Project, error) {
 	// Passing a nil context here because we are on initialization.
 	ver, err := c.dockerComposeVersion(context.Background())
 	if err != nil {
-		logger.Errorf("Unable to determine Docker Compose version: %v. Defaulting to 1.x", err)
-		c.dockerComposeV1 = true
-		return &c, nil
+		return nil, fmt.Errorf("unable to determine Docker Compose version: %w", err)
 	}
-
-	versionMessage := fmt.Sprintf("Determined Docker Compose version: %v", ver)
-	if ver.Major() == 1 {
-		versionMessage = fmt.Sprintf("%s, the tool will use Compose V1", versionMessage)
-		c.dockerComposeV1 = true
+	if ver.Major() < 2 {
+		return nil, fmt.Errorf("required Docker Compose v2, found %s", ver.String())
 	}
-	logger.Debug(versionMessage)
+	logger.Debugf("Determined Docker Compose version: %v", ver)
 
 	v, ok = os.LookupEnv(DisableVerboseOutputComposeEnv)
-	if !c.dockerComposeV1 && ok && strings.ToLower(v) != "false" {
+	if ok && strings.ToLower(v) != "false" {
 		if c.composeVersion.LessThan(semver.MustParse("2.19.0")) {
 			c.disableANSI = true
 		} else {
@@ -543,8 +537,5 @@ func (p *Project) dockerComposeVersion(ctx context.Context) (*semver.Version, er
 
 // ContainerName method the container name for the service.
 func (p *Project) ContainerName(serviceName string) string {
-	if p.dockerComposeV1 {
-		return fmt.Sprintf("%s_%s_1", p.name, serviceName)
-	}
 	return fmt.Sprintf("%s-%s-1", p.name, serviceName)
 }

internal/servicedeployer/_static/docker-custom-agent-base.yml

@@ -1,4 +1,3 @@
-version: "2.3"
 services:
   docker-custom-agent:
     image: "${ELASTIC_AGENT_IMAGE_REF}"

internal/servicedeployer/_static/terraform_deployer.yml

@@ -1,4 +1,3 @@
-version: '2.3'
 services:
   terraform:
     build: .

internal/stack/_static/docker-compose-stack.yml.tmpl

@@ -1,7 +1,6 @@
 {{ $username := fact "username" }}
 {{ $password := fact "password" }}
 {{ $apm_enabled := fact "apm_enabled" }}
-version: '2.4'
 services:
   elasticsearch:
     image: "${ELASTICSEARCH_IMAGE_REF}"

internal/stack/_static/serverless-docker-compose.yml.tmpl

@@ -1,4 +1,3 @@
-version: '2.4'
 services:
   elastic-agent:
     image: "{{ fact "agent_image" }}"

test/packages/false_positives/cisco_asa/_dev/deploy/docker/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "2.3"
 services:
   cisco-logfile:
     image: alpine