diff --git a/Dockerfile b/Dockerfile index 7ff7ffc..6c53b05 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ @@ -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 \ diff --git a/Dockerfile-ubi b/Dockerfile-ubi index a19a2d7..7629cfc 100644 --- a/Dockerfile-ubi +++ b/Dockerfile-ubi @@ -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 \ @@ -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 \