fix: generate complete variant binaries properly

dev-tools/mage/dockerbuilder.go

@@ -73,13 +73,13 @@ func (b *dockerBuilder) Build() error {
 			return errors.Wrap(err, "failed to prepare build")
 		}
 
-		tag, err := b.dockerBuild(variant)
+		tag, err := b.dockerBuild()
 		tries := 3
 		for err != nil && tries != 0 {
 			fmt.Println(">> Building docker images again (after 10 s)")
 			// This sleep is to avoid hitting the docker build issues when resources are not available.
 			time.Sleep(time.Second * 10)
-			tag, err = b.dockerBuild(variant)
+			tag, err = b.dockerBuild()
 			tries -= 1
 		}
 		if err != nil {
@@ -194,11 +194,9 @@ func (b *dockerBuilder) expandDockerfile(templatesDir string, data map[string]in
 	return nil
 }
 
-func (b *dockerBuilder) dockerBuild(variant string) (string, error) {
+func (b *dockerBuilder) dockerBuild() (string, error) {
 	imageName := b.imageName
-	if variant != "" {
-		imageName = fmt.Sprintf("%s-%s", imageName, variant)
-	}
+
 	taggedImageName := fmt.Sprintf("%s:%s", imageName, b.Version)
 	if b.Snapshot {
 		taggedImageName = taggedImageName + "-SNAPSHOT"

dev-tools/mage/pkgtypes.go

@@ -48,7 +48,7 @@ const (
 	packageStagingDir = "build/package"
 
 	// defaultBinaryName specifies the output file for zip and tar.gz.
-	defaultBinaryName = "{{.Name}}-{{if .Variant}}{{.Variant}}-{{end}}{{.Version}}{{if .Snapshot}}-SNAPSHOT{{end}}{{if .OS}}-{{.OS}}{{end}}{{if .Arch}}-{{.Arch}}{{end}}"
+	defaultBinaryName = "{{.Name}}-{{.Version}}{{if .Snapshot}}-SNAPSHOT{{end}}{{if .OS}}-{{.OS}}{{end}}{{if .Arch}}-{{.Arch}}{{end}}"
 )
 
 // PackageType defines the file format of the package (e.g. zip, rpm, etc).

dev-tools/packaging/packages.yml

@@ -449,6 +449,11 @@ shared:
       from: 'arm64v8/centos:7'
       buildFrom: 'arm64v8/centos:7'
 
+  - &agent_docker_complete_spec
+    extra_vars:
+      dockerfile: 'Dockerfile.elastic-agent.tmpl'
+      image_name: '{{.BeatName}}-complete'
+
   # Deb/RPM spec for community beats.
   - &deb_rpm_spec
     <<: *common
@@ -1000,6 +1005,18 @@ specs:
         <<: *agent_docker_spec
         <<: *elastic_docker_spec
         <<: *elastic_license_for_binaries
+        files:
+          '{{.BeatName}}{{.BinaryExt}}':
+            source: ./build/golang-crossbuild/{{.BeatName}}-{{.GOOS}}-{{.Platform.Arch}}{{.BinaryExt}}
+
+    - os: linux
+      arch: amd64
+      types: [docker]
+      spec:
+        <<: *agent_docker_spec
+        <<: *agent_docker_complete_spec
+        <<: *elastic_docker_spec
+        <<: *elastic_license_for_binaries
         # This image gets a 'complete' variant for synthetics and other large
         # packages too big to fit in the main image
         variants: ["complete"]
@@ -1026,6 +1043,18 @@ specs:
         <<: *agent_docker_arm_spec
         <<: *elastic_docker_spec
         <<: *elastic_license_for_binaries
+        files:
+          '{{.BeatName}}{{.BinaryExt}}':
+            source: ./build/golang-crossbuild/{{.BeatName}}-{{.GOOS}}-{{.Platform.Arch}}{{.BinaryExt}}
+
+    - os: linux
+      arch: arm64
+      types: [docker]
+      spec:
+        <<: *agent_docker_arm_spec
+        <<: *agent_docker_complete_spec
+        <<: *elastic_docker_spec
+        <<: *elastic_license_for_binaries
         # This image gets a 'complete' variant for synthetics and other large
         # packages too big to fit in the main image
         variants: ["complete"]

x-pack/elastic-agent/README.md

@@ -17,6 +17,6 @@ If you are in the 7.13 branch, this will create the `docker.elastic.co/beats/ela
 elastic-package stack up --version=7.13.0-SNAPSHOT -v
 ```
 
-Please note that the docker container is built in both standard and 'offline' variants.
-The 'offline' variant contains extra files, like the chromium browser, that are too large
+Please note that the docker container is built in both standard and 'complete' variants.
+The 'complete' variant contains extra files, like the chromium browser, that are too large
 for the standard variant.