Skip to content

Commit

Permalink
Revert "UPGRADE: influxDB v2.7.1 & telegraf v1.28.2"
Browse files Browse the repository at this point in the history
  • Loading branch information
reyesj2 authored Oct 25, 2023
1 parent b7c9a70 commit 45c7b50
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions so-influxdb/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"]
4 changes: 2 additions & 2 deletions so-telegraf/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]

0 comments on commit 45c7b50

Please sign in to comment.