From 9162582ac407562facf166573f601187d81e418e Mon Sep 17 00:00:00 2001
From: Viacheslav <xrw.null@gmail.com>
Date: Mon, 29 Apr 2024 21:37:18 -0700
Subject: [PATCH] lap pognali

---
 cloud/infrastructure/filebeat/filebeat/Dockerfile  |  6 ++++++
 cloud/infrastructure/integration-tools/Dockerfile  | 14 +++++++++++++-
 .../integration/loader/LoaderCommand.kt            |  3 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/cloud/infrastructure/filebeat/filebeat/Dockerfile b/cloud/infrastructure/filebeat/filebeat/Dockerfile
index d62f41f7..d68ca302 100644
--- a/cloud/infrastructure/filebeat/filebeat/Dockerfile
+++ b/cloud/infrastructure/filebeat/filebeat/Dockerfile
@@ -1,5 +1,11 @@
 FROM docker.elastic.co/beats/filebeat:7.10.0
 
+USER root
+
+RUN yum install -y yum-utils \
+    && yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo \
+    && yum install -y docker-ce-cli
+
 ADD filebeat.yml /usr/share/filebeat/filebeat.yml
 
 CMD filebeat -e --strict.perms=false --once run
diff --git a/cloud/infrastructure/integration-tools/Dockerfile b/cloud/infrastructure/integration-tools/Dockerfile
index 51448eca..62a37c51 100644
--- a/cloud/infrastructure/integration-tools/Dockerfile
+++ b/cloud/infrastructure/integration-tools/Dockerfile
@@ -1,4 +1,16 @@
-FROM openjdk
+FROM openjdk:21-bullseye
+
+RUN apt update \
+    && apt install -y ca-certificates curl \
+    && install -m 0755 -d /etc/apt/keyrings \
+    && curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc \
+    && chmod a+r /etc/apt/keyrings/docker.asc \
+    && echo \
+         "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
+         $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+        tee /etc/apt/sources.list.d/docker.list > /dev/null
+
+RUN apt update && apt install -y docker-ce-cli
 
 ADD ./lib /app/lib/
 ADD ./*.jar /app/
diff --git a/cloud/infrastructure/integration-tools/src/main/kotlin/org/corfudb/cloud/infrastructure/integration/loader/LoaderCommand.kt b/cloud/infrastructure/integration-tools/src/main/kotlin/org/corfudb/cloud/infrastructure/integration/loader/LoaderCommand.kt
index 76a94e85..2a1b574a 100644
--- a/cloud/infrastructure/integration-tools/src/main/kotlin/org/corfudb/cloud/infrastructure/integration/loader/LoaderCommand.kt
+++ b/cloud/infrastructure/integration-tools/src/main/kotlin/org/corfudb/cloud/infrastructure/integration/loader/LoaderCommand.kt
@@ -44,7 +44,8 @@ class LoaderManager(
                         "--name ${aggregationUnit}-${archive.name} " +
                         "-v log-aggregation-data:/data " +
                         "${toolConfig.filebeatImage} " +
-                        "filebeat -e --strict.perms=false " +
+                        "filebeat" +
+                        " -e --strict.perms=false " +
                         "-E fields.server=${archive.name} " +
                         "-E fields.aggregation_unit=${aggregationUnit} " +
                         "-E BASE_DIR=/data/${aggregationUnit}/${archive.name} " +