Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM hashicorp/terraform:1.10.5 as terraform
FROM hashicorp/terraform:1.12.2 AS terraform

FROM alpine:3.21.3

ENV COLLECTION_VERSION=5577707ce153198a2dacbdfc6baa8db349cac944
ENV MONITORS_VERSION=v1.2.5
ENV COLLECTION_VERSION=bb30168bb695e3cb8a4051e631f623e622be68e5
ENV MONITORS_VERSION=v1.2.7
ARG TARGETPLATFORM

RUN apk add --no-cache \
Expand All @@ -21,8 +21,8 @@ COPY --from=terraform /bin/terraform /usr/local/bin/terraform

USER setup
RUN cd /terraform/ \
&& curl -O https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/${COLLECTION_VERSION}/deploy/helm/sumologic/conf/setup/main.tf \
&& terraform init \
&& curl -O https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/"${COLLECTION_VERSION}"/deploy/helm/sumologic/conf/setup/main.tf \
&& terraform init -input=false || terraform init -input=false -upgrade \
&& rm main.tf
RUN cd /monitors/ \
&& git clone https://github.com/SumoLogic/terraform-sumologic-sumo-logic-monitor.git \
Expand Down
21 changes: 12 additions & 9 deletions Dockerfile-ubi
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
FROM hashicorp/terraform:1.10.5 as terraform
FROM hashicorp/terraform:1.12.2 AS terraform

FROM registry.access.redhat.com/ubi8/ubi:8.10
FROM registry.access.redhat.com/ubi9/ubi:9.6

ENV SUMMARY="UBI based Sumo Logic Kubernetes Setup" \
DESCRIPTION="UBI based setup image for the Sumo Logic Kubernetes Collection"

ENV COLLECTION_VERSION=v4.6.1
ENV MONITORS_VERSION=v1.2.4
ENV COLLECTION_VERSION=v4.13.0
ENV MONITORS_VERSION=v1.2.7
ARG TARGETPLATFORM

RUN dnf update -y \
&& dnf install -y \

RUN dnf update -y \
&& dnf install -y --allowerasing \
curl-full libcurl-full \
bash \
curl \
jq \
git \
&& dnf clean all \
Expand All @@ -25,8 +26,10 @@ COPY --from=terraform /bin/terraform /usr/local/bin/terraform

USER setup
RUN cd /terraform/ \
&& curl -O https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/${COLLECTION_VERSION}/deploy/helm/sumologic/conf/setup/main.tf \
&& terraform init \
&& curl -O https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/refs/heads/bump-terraform/deploy/helm/sumologic/conf/setup/main.tf \
&& cat main.tf \
&& rm -rf ~/.terraform.d/plugins \
&& terraform init -input=false -upgrade \
&& rm main.tf
RUN cd /monitors/ \
&& git clone https://github.com/SumoLogic/terraform-sumologic-sumo-logic-monitor.git \
Expand Down