Build cloud docker images for elastic-agent

.ci/packaging.groovy

@@ -335,10 +335,12 @@ def tagAndPush(Map args = [:]) {
   }
   // supported image flavours
   def variants = ["", "-oss", "-ubi8"]
-  // 
+
   if(beatName == 'elastic-agent'){
       variants.add("-complete")
+      variants.add("-cloud")
   }
+
   variants.each { variant ->
     tags.each { tag ->
       // TODO:

Jenkinsfile

@@ -459,9 +459,9 @@ def tagAndPush(Map args = [:]) {
   // supported image flavours
   def variants = ["", "-oss", "-ubi8"]
 
-  // only add complete variant for the elastic-agent
   if(beatName == 'elastic-agent'){
       variants.add("-complete")
+      variants.add("-cloud")
   }
 
   variants.each { variant ->

dev-tools/packaging/packages.yml

@@ -449,6 +449,16 @@ shared:
       from: 'arm64v8/centos:7'
       buildFrom: 'arm64v8/centos:7'
 
+  - &cloud_agent_docker_spec
+    <<: *agent_docker_spec
+    extra_vars:
+      image_name: '{{.BeatName}}-cloud'
+
+  - &cloud_agent_docker_arm_spec
+    <<: *agent_docker_arm_spec
+    extra_vars:
+      image_name: '{{.BeatName}}-cloud'
+
   # Deb/RPM spec for community beats.
   - &deb_rpm_spec
     <<: *common
@@ -998,10 +1008,11 @@ specs:
       types: [docker]
       spec:
         <<: *agent_docker_spec
+        <<: *cloud_agent_docker_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
+        # packages too big to fit in the main image.
         variants: ["complete"]
         files:
           '{{.BeatName}}{{.BinaryExt}}':
@@ -1024,10 +1035,11 @@ specs:
       types: [docker]
       spec:
         <<: *agent_docker_arm_spec
+        <<: *cloud_agent_docker_arm_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
+        # packages too big to fit in the main image.
         variants: ["complete"]
         files:
           '{{.BeatName}}{{.BinaryExt}}':

dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl

@@ -22,6 +22,10 @@ RUN mkdir -p {{ $beatHome }}/data {{ $beatHome }}/data/elastic-agent-{{ commit_s
 {{- end }}
 {{- range $i, $modulesd := .ModulesDirs }}
     chmod 0775 {{ $beatHome}}/{{ $modulesd }} && \
+{{- end }}
+{{- if contains .from "-cloud" }}
+    tar -xvf {{ $beatHome }}/data/elastic-agent-*/downloads/metricbeat-*.tar.gz --strip-components 1 --directory /opt --wildcards "*metricbeat" && \
+    tar -xvf {{ $beatHome }}/data/elastic-agent-*/downloads/filebeat-*.tar.gz --strip-components 1 --directory /opt --wildcards "*filebeat" && \
 {{- end }}
     true
 
@@ -41,7 +45,6 @@ RUN case $(arch) in aarch64) YUM_FLAGS="-x bind-license";; esac; \
         yum install -y epel-release &&  \
         yum update -y $YUM_FLAGS && \
         yum install -y jq && \
-
         yum clean all && \
         exit_code=0 && break || exit_code=$? && echo "yum error: retry $iter in 10s" && sleep 10; \
     done; \
@@ -134,6 +137,11 @@ RUN mkdir /licenses
 COPY --from=home {{ $beatHome }}/LICENSE.txt /licenses
 COPY --from=home {{ $beatHome }}/NOTICE.txt /licenses
 
+{{- if contains .from "-cloud" }}
+COPY --from=home /opt/filebeat /opt/filebeat
+COPY --from=home /opt/metricbeat /opt/metricbeat
+{{- end }}
+
 {{- if ne .user "root" }}
 RUN groupadd --gid 1000 {{ .BeatName }}
 RUN useradd -M --uid 1000 --gid 1000 --groups 0 --home {{ $beatHome }} {{ .user }}