Create extra set of UBI based images (elastic#14796)

* Create extra set of UBI based images
* Rename container to beat-ubi
* Create a docker-ubi spec
* Move ubi updates to elastic_beat_xpack section.
* Expand extra vars for docker image name.
* Name image with ubi7 instead of ubi

dev-tools/mage/dockerbuilder.go

@@ -130,11 +130,18 @@ func (b *dockerBuilder) prepareBuild() error {
 }
 
 func (b *dockerBuilder) dockerBuild() (string, error) {
-	tag := fmt.Sprintf("%s:%s", b.Name, b.Version)
+	imageName := b.Name
+	if name, _ := b.ExtraVars["image_name"]; name != "" {
+		var err error
+		imageName, err = b.Expand(name)
+		if err != nil {
+			return "", err
+		}
+	}
+	tag := fmt.Sprintf("%s:%s", imageName, b.Version)
 	if b.Snapshot {
 		tag = tag + "-SNAPSHOT"
 	}
-
 	if repository, _ := b.ExtraVars["repository"]; repository != "" {
 		tag = fmt.Sprintf("%s/%s", repository, tag)
 	}

dev-tools/packaging/packages.yml

@@ -173,6 +173,11 @@ shared:
     extra_vars:
       repository: 'docker.elastic.co/beats'
 
+  - &docker_ubi_spec
+    extra_vars:
+      image_name: '{{.BeatName}}-ubi7'
+      from: 'registry.access.redhat.com/ubi7/ubi:7.7'
+
   #
   # License modifiers for Apache 2.0
   #
@@ -338,6 +343,14 @@ specs:
         <<: *elastic_docker_spec
         <<: *elastic_license_for_binaries
 
+    - os: linux
+      types: [docker]
+      spec:
+        <<: *docker_spec
+        <<: *docker_ubi_spec
+        <<: *elastic_docker_spec
+        <<: *elastic_license_for_binaries
+
   # Elastic Beat with Elastic License and binary taken from the x-pack dir.
   elastic_beat_xpack_separate_binaries:
     ###