UNCLASSIFIED

Commit 5b4876a1 authored by Jeffrey Weatherford's avatar Jeffrey Weatherford
Browse files

Merge branch 'splunk-8-2-1' into 'development'

Update to Splunk 8.2.1

See merge request !17
parents 6f70ef7b 296c6ced
Pipeline #357021 passed with stages
in 63 minutes and 16 seconds
......@@ -18,7 +18,7 @@ ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8-minimal
ARG BASE_TAG=8.4
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} as base
#FROM registry.access.redhat.com/ubi8/ubi-minimal:8.3-291 as base
#FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4-205 as base
#remove if there is no need to have scloud in this build
ARG SCLOUD_URL
......@@ -61,8 +61,8 @@ RUN tar -zxf /usr/bin/scloud.tar.gz -C /usr/bin/ && rm /usr/bin/scloud.tar.gz
#end base setup
ARG SPLUNK_PRODUCT=splunk
ARG SPLUNK_VERSION=8.2.0
ARG SPLUNK_BUILD=e053ef3c985f
ARG SPLUNK_VERSION=8.2.1
ARG SPLUNK_BUILD=ddff1c41e5cf
ARG SPLUNK_ARCH=x86_64
ARG SPLUNK_LINUX_FILENAME=splunk-${SPLUNK_VERSION}-${SPLUNK_BUILD}-Linux-${SPLUNK_ARCH}.tgz
......@@ -72,7 +72,7 @@ FROM base as package
COPY scripts/make-minimal-exclude.py /tmp
ENV SPLUNK_BUILD_URL=https://download.splunk.com/products/${SPLUNK_PRODUCT}/releases/${SPLUNK_VERSION}/linux/${SPLUNK_LINUX_FILENAME}
RUN python /tmp/make-minimal-exclude.py $SPLUNK_BUILD_URL > /tmp/splunk-minimal-exclude.list
COPY splunk-8.2.0-e053ef3c985f-Linux-x86_64.tgz /tmp/splunk.tgz
COPY splunk-8.2.1-ddff1c41e5cf-Linux-x86_64.tgz /tmp/splunk.tgz
RUN mkdir -p /minimal/splunk/var /extras/splunk/var
RUN tar -C /minimal/splunk --strip 1 --exclude-from=/tmp/splunk-minimal-exclude.list -zxf /tmp/splunk.tgz
RUN tar -C /extras/splunk --strip 1 --wildcards --files-from=/tmp/splunk-minimal-exclude.list -zxf /tmp/splunk.tgz
......@@ -80,7 +80,7 @@ RUN mv /minimal/splunk/etc /minimal/splunk-etc
RUN mv /extras/splunk/etc /extras/splunk-etc
RUN mkdir -p /minimal/splunk/etc /minimal/splunk/share/splunk/search_mrsparkle/modules.new
COPY splunk-ansible.tar.gz splunk-ansible.tar.gz
RUN tar -zxf splunk-ansible.tar.gz && mv splunk-ansible-8.2.0 splunk-ansible-develop && rm splunk-ansible.tar.gz
RUN tar -zxf splunk-ansible.tar.gz && mv splunk-ansible-8.2.1 splunk-ansible-develop && rm splunk-ansible.tar.gz
#
# Minimal Splunk base image with many files excluded, intended for internal and experimental use
......
......@@ -23,16 +23,16 @@ labels:
mil.dso.ironbank.product.name: "Splunk Enterprise"
resources:
- url: https://github.com/splunk/splunk-ansible/archive/8.2.0.tar.gz
- url: https://github.com/splunk/splunk-ansible/archive/8.2.1.tar.gz
filename: splunk-ansible.tar.gz
validation:
type: sha256
value: 7e5b254a4db208d8dee261ec56edbdbbcedf54f42c7d02031f8f523892ed0a36
- url: https://download.splunk.com/products/splunk/releases/8.2.0/linux/splunk-8.2.0-e053ef3c985f-Linux-x86_64.tgz
filename: splunk-8.2.0-e053ef3c985f-Linux-x86_64.tgz
value: 2b749382aab23a2590792245d9e8b79c4ab285049b90b06efded254de419a264
- url: https://download.splunk.com/products/splunk/releases/8.2.1/linux/splunk-8.2.1-ddff1c41e5cf-Linux-x86_64.tgz
filename: splunk-8.2.1-ddff1c41e5cf-Linux-x86_64.tgz
validation:
type: sha256
value: 868ac331aee0a3437a85cd57604bace201c4ad77c68ee1bbde0cc90fe3f0b717
value: 665485ddf65d115f0787f8b0df70ba7fc6fb325b7fa58cdbd3149e2dc7572c04
- url: https://github.com/splunk/splunk-cloud-sdk-go/releases/download/v1.11.1/scloud_v7.1.0_linux_amd64.tar.gz
filename: scloud_v7.1.0_linux_amd64.tar.gz
validation:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment