workaround for idaholab#78, pinning sinatra at 2.1.0 so that logstash…

… will start up
mmguero-dev · Feb 17, 2022 · 5d8b3dc · 5d8b3dc
1 parent d19127a
commit 5d8b3dc
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/Dockerfiles/logstash.Dockerfile b/Dockerfiles/logstash.Dockerfile
@@ -1,4 +1,4 @@
-FROM opensearchproject/logstash-oss-with-opensearch-output-plugin:7.16.2
+FROM opensearchproject/logstash-oss-with-opensearch-output-plugin:7.16.3
 
 # Copyright (c) 2022 Battelle Energy Alliance, LLC.  All rights reserved.
 
@@ -38,14 +38,18 @@ USER root
 
 RUN yum install -y epel-release && \
     yum update -y && \
-    yum install -y curl gettext python3-setuptools python3-pip python3-requests openssl && \
+    yum install -y curl gettext patch python3-setuptools python3-pip python3-requests openssl && \
     yum clean all && \
     pip3 install ipaddress supervisor manuf pyyaml && \
-    logstash-plugin install 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 && \
+    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 && \
     rm -rf /root/.cache /root/.gem /root/.bundle
 
 ADD shared/bin/docker-uid-gid-setup.sh /usr/local/bin/
@@ -64,7 +68,10 @@ RUN bash -c "chmod --silent 755 /usr/local/bin/*.sh /usr/local/bin/*.py || true"
     rm -f /usr/share/logstash/pipeline/logstash.conf && \
     rmdir /usr/share/logstash/pipeline && \
     mkdir /logstash-persistent-queue && \
-    chown --silent -R ${PUSER}:root /usr/share/logstash/malcolm-pipelines /logstash-persistent-queue && \
+    chown --silent -R ${PUSER}:root \
+        /usr/share/logstash/malcolm-pipelines \
+        /usr/share/logstash/malcolm-ruby \
+        /logstash-persistent-queue && \
     echo "Retrieving and parsing Wireshark manufacturer database..." && \
     python3 /usr/local/bin/manuf-oui-parse.py -o /etc/vendor_macs.yaml && \
     echo "Retrieving JA3 fingerprint lists..." && \