Fix apt-get. Remove todo from packages.yml.

elastic · Jan 11, 2022 · d838179 · d838179
1 parent 3943bee
commit d838179
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/dev-tools/packaging/packages.yml b/dev-tools/packaging/packages.yml
@@ -669,13 +669,11 @@ shared:
       from: 'arm64v8/ubuntu:20.04'
       buildFrom: 'arm64v8/ubuntu:20.04'
 
-  # TODO: Did I must change those to ?
   - &docker_ubi_spec
     extra_vars:
       image_name: '{{.BeatName}}-ubi8'
       from: 'docker.elastic.co/ubi8/ubi-minimal'
 
-  # TODO: Did I must change those to ?
   - &docker_arm_ubi_spec
     extra_vars:
       image_name: '{{.BeatName}}-ubi8'
@@ -1232,4 +1230,4 @@ specs:
         <<: *elastic_license_for_binaries
         files:
           '{{.BeatName}}{{.BinaryExt}}':
-            source: ./build/golang-crossbuild/{{.BeatName}}-{{.GOOS}}-{{.Platform.Arch}}{{.BinaryExt}}
+            source: ./build/golang-crossbuild/{{.BeatName}}-{{.GOOS}}-{{.Platform.Arch}}{{.BinaryExt}}
diff --git a/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
@@ -68,8 +68,8 @@ RUN apt-get update -y && \
         libpango-1.0-0\
         libcairo2\
         libasound2\
-        libatspi2.0-0 \
-        libxshmfence1 \
+        libatspi2.0-0\
+        libxshmfence1 && \
         apt-get clean all && \
         exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \
     done; \

diff --git a/dev-tools/packaging/templates/docker/Dockerfile.tmpl b/dev-tools/packaging/templates/docker/Dockerfile.tmpl
@@ -58,7 +58,7 @@ RUN apt-get update -y && \
         libpango-1.0-0\
         libcairo2\
         libasound2\
-        libatspi2.0-0 \
+        libatspi2.0-0\
         libxshmfence1 && \
         apt-get clean all && \
         exit_code=0 && break || exit_code=$? && echo "apt-get error: retry $iter in 10s" && sleep 10; \