Skip to content

Commit

Permalink
Merge pull request #569 from splunk/develop
Browse files Browse the repository at this point in the history
Release 9.0.4
  • Loading branch information
adityapinglesf authored Feb 15, 2023
2 parents c5b9b6a + 792710a commit 09c79ea
Show file tree
Hide file tree
Showing 8 changed files with 186 additions and 317 deletions.
20 changes: 0 additions & 20 deletions .circleci/anchore-policy.json

This file was deleted.

276 changes: 0 additions & 276 deletions .circleci/config.yml

This file was deleted.

6 changes: 3 additions & 3 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

# Default owners for everything in docker-splunk:
# * @splunk/if-01
* @alishamayor @jrigassio-splunk @jmeixensperger @hendolim @bb03 @sarahotis @martinluo22 @ngood97-splunk @adityapinglesf
* @alishamayor @jmeixensperger @hendolim @sarahotis @martinluo22 @ngood97-splunk @adityapinglesf

# Docs-only pull requests:
/docs/ @alishamayor @bb03
/docs/ @alishamayor

# Release changelog
docs/CHANGELOG.md @alishamayor @jrigassio-splunk @jmeixensperger @hendolim @bb03 @sarahotis @ngood97-splunk @adityapinglesf
docs/CHANGELOG.md @alishamayor @jmeixensperger @hendolim @sarahotis @ngood97-splunk @adityapinglesf
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ SPLUNK_ANSIBLE_BRANCH ?= develop
SPLUNK_COMPOSE ?= cluster_absolute_unit.yaml
# Set Splunk version/build parameters here to define downstream URLs and file names
SPLUNK_PRODUCT := splunk
SPLUNK_VERSION := 8.2.5
SPLUNK_BUILD := 77015bc7a462
SPLUNK_VERSION := 9.0.4
SPLUNK_BUILD := de405f4a7979
ifeq ($(shell arch), s390x)
SPLUNK_ARCH = s390x
else
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Docker-Splunk: Containerizing Splunk Enterprise

[![Build Status](https://circleci.com/gh/splunk/docker-splunk/tree/develop.svg?style=svg)](https://circleci.com/gh/splunk/docker-splunk/tree/develop) 
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) 
[![GitHub release](https://img.shields.io/github/v/tag/splunk/docker-splunk?sort=semver&label=Version)](https://github.com/splunk/docker-splunk/releases)

Expand Down
18 changes: 11 additions & 7 deletions base/redhat-8/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,14 @@ export LANG=en_US.utf8

# Install utility packages
microdnf -y --nodocs install wget sudo shadow-utils procps tar make gcc \
openssl-devel bzip2-devel libffi-devel findutils
openssl-devel bzip2-devel libffi-devel findutils \
libssh-devel libcurl-devel glib2-devel ncurses-devel
# Patch security updates
microdnf -y --nodocs update gnutls kernel-headers librepo libnghttp2 nettle \
libpwquality libxml2 systemd-libs glib2 lz4-libs \
rpm rpm-libs sqlite-libs cyrus-sasl-lib vim
microdnf -y --nodocs update gnutls kernel-headers libdnf librepo libnghttp2 nettle \
libpwquality libxml2 systemd-libs lz4-libs curl \
rpm rpm-libs sqlite-libs cyrus-sasl-lib vim expat \
openssl-libs xz-libs zlib libsolv file-libs pcre \
libarchive libgcrypt libksba libstdc++ json-c gnupg

# Reinstall tzdata (originally stripped from minimal image): https://bugzilla.redhat.com/show_bug.cgi?id=1903219
microdnf -y --nodocs reinstall tzdata || microdnf -y --nodocs update tzdata
Expand Down Expand Up @@ -67,9 +70,10 @@ find /usr/lib/ -depth \( -type f -a -name 'wininst-*.exe' \) -exec rm -rf '{}' \
ldconfig

# Cleanup
microdnf remove -y make gcc openssl-devel bzip2-devel libffi-devel findutils cpp binutils \
glibc-devel keyutils-libs-devel krb5-devel libcom_err-devel libselinux-devel \
libsepol-devel libverto-devel libxcrypt-devel pcre2-devel zlib-devel
microdnf remove -y make gcc openssl-devel bzip2-devel findutils glib2-devel glibc-devel cpp binutils \
keyutils-libs-devel krb5-devel libcom_err-devel libffi-devel libcurl-devel \
libselinux-devel libsepol-devel libssh-devel libverto-devel libxcrypt-devel \
ncurses-devel pcre2-devel zlib-devel
microdnf clean all

# Install scloud
Expand Down
Loading

0 comments on commit 09c79ea

Please sign in to comment.