From 45c7b50b8fd6d00f32e65b18ff688422f7f5ac52 Mon Sep 17 00:00:00 2001 From: Jorge Reyes <94730068+reyesj2@users.noreply.github.com> Date: Wed, 25 Oct 2023 13:30:28 -0400 Subject: [PATCH] Revert "UPGRADE: influxDB v2.7.1 & telegraf v1.28.2" --- so-influxdb/Dockerfile | 10 +++++----- so-telegraf/Dockerfile | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/so-influxdb/Dockerfile b/so-influxdb/Dockerfile index 9ebde4ad..a38363d4 100644 --- a/so-influxdb/Dockerfile +++ b/so-influxdb/Dockerfile @@ -1,12 +1,12 @@ -ARG INFLUX_VERSION=2.7.1 +ARG INFLUX_VERSION=2.6.1 -FROM ghcr.io/security-onion-solutions/ubuntu:23.04 as builder +FROM ghcr.io/security-onion-solutions/ubuntu:22.04 as builder ARG INFLUX_VERSION -ARG NODE_VERSION=v20.8.1 +ARG NODE_VERSION=v18.14.0 ARG NODE_ARCH=linux-x64 -RUN apt update -y && apt install -y git wget xz-utils +RUN apt update -y && apt install -y git wget xz-utils RUN git clone https://github.com/influxdata/ui -b OSS-v$INFLUX_VERSION RUN wget https://nodejs.org/dist/$NODE_VERSION/node-$NODE_VERSION-$NODE_ARCH.tar.xz -O /node.xz RUN tar -xJf /node.xz @@ -34,7 +34,7 @@ RUN chmod a+x /redirect_to_file.sh && groupmod -g 939 influxdb COPY --from=builder /ui/build /ui -RUN apt update -y && apt install netcat-traditional -y && apt clean -y +RUN apt update -y && apt install netcat -y && apt clean -y ENTRYPOINT ["/redirect_to_file.sh"] CMD ["/entrypoint.sh", "influxd"] \ No newline at end of file diff --git a/so-telegraf/Dockerfile b/so-telegraf/Dockerfile index 3bcc0538..9b909a90 100644 --- a/so-telegraf/Dockerfile +++ b/so-telegraf/Dockerfile @@ -1,10 +1,10 @@ -FROM ghcr.io/security-onion-solutions/telegraf:1.28.2-alpine +FROM ghcr.io/security-onion-solutions/telegraf:1.25.1-alpine LABEL maintainer "Security Onion Solutions, LLC" LABEL description="Telegraf running in Docker container for use with Security Onion" USER root -RUN apk add --no-cache redis curl jq bash +RUN apk add --no-cache redis curl jq ENTRYPOINT ["/entrypoint.sh"] CMD ["telegraf"]