From 4ef0b93193d9812431a72171d757896bec89c4f7 Mon Sep 17 00:00:00 2001
From: SG <13872653+mmguero@users.noreply.github.com>
Date: Thu, 17 Feb 2022 11:30:28 -0700
Subject: [PATCH] cleaner, workaround for idaholab/Malcolm#78, pinning sinatra
 at 2.1.0 so that logstash will start up up; use --preserve flag implemented
 in elastic/logstash#5224

---
 Dockerfiles/logstash.Dockerfile | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Dockerfiles/logstash.Dockerfile b/Dockerfiles/logstash.Dockerfile
index a229bf423..b761c1ae6 100644
--- a/Dockerfiles/logstash.Dockerfile
+++ b/Dockerfiles/logstash.Dockerfile
@@ -41,15 +41,11 @@ RUN yum install -y epel-release && \
     yum install -y curl gettext patch python3-setuptools python3-pip python3-requests openssl && \
     yum clean all && \
     pip3 install ipaddress supervisor manuf pyyaml && \
-    for PACKAGE in logstash-filter-translate logstash-filter-cidr logstash-filter-dns \
-                   logstash-filter-json logstash-filter-prune logstash-filter-http \
-                   logstash-filter-grok logstash-filter-geoip logstash-filter-uuid \
-                   logstash-filter-kv logstash-filter-mutate logstash-filter-dissect \
-                   logstash-input-beats logstash-output-elasticsearch; do \
-        for GEM in rack-protection sinatra; do sed -i "s/\($GEM.*\)2\.2\.0/\12\.1\.0/" /usr/share/logstash/Gemfile.lock; done; \
-        logstash-plugin install "$PACKAGE"; \
-        for GEM in rack-protection sinatra; do sed -i "s/\($GEM.*\)2\.2\.0/\12\.1\.0/" /usr/share/logstash/Gemfile.lock; done; \
-    done && \
+    logstash-plugin install --preserve logstash-filter-translate logstash-filter-cidr logstash-filter-dns \
+                                       logstash-filter-json logstash-filter-prune logstash-filter-http \
+                                       logstash-filter-grok logstash-filter-geoip logstash-filter-uuid \
+                                       logstash-filter-kv logstash-filter-mutate logstash-filter-dissect \
+                                       logstash-input-beats logstash-output-elasticsearch && \
     rm -rf /root/.cache /root/.gem /root/.bundle
 
 ADD shared/bin/docker-uid-gid-setup.sh /usr/local/bin/