instantlinux · instantlinux · Dec 9, 2025 · Dec 9, 2025
diff --git a/images/git-dump/helm/Chart.yaml b/images/git-dump/helm/Chart.yaml
@@ -5,8 +5,8 @@ home: https://github.com/instantlinux/docker-tools
 sources:
 - https://github.com/instantlinux/docker-tools
 type: application
-version: 0.1.18
-appVersion: "2.49.1-r0"
+version: 0.1.19
+appVersion: "2.52.0-r0"
 dependencies:
 - name: chartlib
   version: 0.1.8

diff --git a/images/mariadb-galera/Makefile b/images/mariadb-galera/Makefile
@@ -1,100 +1,7 @@
-# Standard Makefile for Docker image
-#   created by richb@instantlinux.net 20-Apr-2017
-
-BUILDX      = https://github.com/docker/buildx/releases/download/v0.4.1/buildx-v0.4.1.linux-amd64
-PLATFORMS  ?= linux/amd64
-PUSH       ?= --push
-USER_LOGIN ?= instantlinux
-VENV        = python_env
-VDIR        = $(PWD)/$(VENV)
-
-export IMAGE_NAME  = $(REGISTRY)/$(IMAGE):$(TAG)
-export DOCKER_REPO = $(USER_LOGIN)/$(IMAGE)
-
-ifneq ($(CI_COMMIT_TAG),)
-  TAG_OPT   = --tag $(USER_LOGIN)$(IMAGE):$(CI_COMMIT_TAG)      
-endif
-
-# Exceptions
-ifeq ($(IMAGE),data-sync)
-  PLATFORMS = linux/amd64,linux/aarch64
-endif
-ifeq ($(IMAGE),mariadb-galera)
-  PLATFORMS = linux/amd64
-endif
-ifeq ($(IMAGE),mythtv-backend)
-  PLATFORMS = linux/amd64
-endif
-ifeq ($(IMAGE),nagiosql)
-  PLATFORMS = linux/amd64,linux/arm64,linux/arm/v7
-endif
-ifeq ($(IMAGE),postfix-python)
-  # qemu bombs out with cpu_exec assertion since Dec 2023 on arm/v7
-  PLATFORMS = linux/amd64,linux/aarch64,linux/arm64
-endif
-ifeq ($(IMAGE),$(filter $(IMAGE),python-builder python-wsgi))
-  # helm package on arm/v6 isn't supported as of Aug 2021
-  #  others had issues with pipenv hashes Jul 2023
-  PLATFORMS = linux/amd64,linux/arm64
-endif
-ifeq ($(IMAGE),spamassassin)
-  PLATFORMS = linux/amd64,linux/arm64
-endif
-
-analysis: flake8
-	  @echo "Running static analysis"
+include ../../lib/build/Makefile.docker_image
 
 test: pytest
 
-test_functional:
-	@echo "Running functional verification of running image"
-
-create_image: $(HOME)/.docker/cli-plugins/docker-buildx
-	docker buildx build --tag $(REGISTRY)/$(IMAGE):$(TAG) --platform $(PLATFORMS) \
-	  $(PUSH) --file Dockerfile . \
-	  --build-arg=VCS_REF=$(CI_COMMIT_SHA) \
-	  --build-arg=BUILD_DATE=$(shell date +%Y-%m-%dT%H:%M:%SZ)
-
-promote_image: $(HOME)/.docker/cli-plugins/docker-buildx
-	# Log into dockerhub
-	docker login -u $(USER_LOGIN) -p $(DOCKER_TOKEN)
-	docker buildx build $(TAG_OPT) \
-	  `[ -e hooks/add_tags ] && hooks/add_tags` \
-	  --tag $(USER_LOGIN)/$(IMAGE):latest --platform $(PLATFORMS) \
-	  --push --file Dockerfile . \
-	  --build-arg=VCS_REF=$(CI_COMMIT_SHA) \
-	  --build-arg=BUILD_DATE=$(shell date +%Y-%m-%dT%H:%M:%SZ)
-	-if [ -x hooks/post_build ]; then sh hooks/post_build; fi
-
-	# TODO update dockerhub README if/when that is supported,
-	# see https://github.com/docker/hub-feedback/issues/1927
-	# and https://github.com/docker/hub-feedback/issues/2127
-
-flake8: test_requirements
-	@echo "Running flake8 code analysis"
-	(. $(VDIR)/bin/activate ; flake8 --exclude=python_env .)
-
-python_env: $(VDIR)/bin/python
-
-test_requirements: python_env
-	@echo "Installing test requirements"
-	(if [ -f requirements/test.txt ]; then \
-	  . $(VDIR)/bin/activate && \
-	  pip install -r requirements/test.txt -r requirements/common.txt; \
-	 fi)
-
-$(VDIR)/bin/python:
-	@echo "Creating virtual environment"
-	virtualenv --system-site-packages $(VENV)
-
-$(HOME)/.docker/cli-plugins/docker-buildx:
-	mkdir -p $(HOME)/.docker/cli-plugins/
-	wget -O $(HOME)/.docker/cli-plugins/docker-buildx $(BUILDX)
-	chmod +x $(HOME)/.docker/cli-plugins/docker-buildx
-	docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-	docker buildx create --name multibuild
-	docker buildx use multibuild
-
 pytest: test_requirements
 	@echo "Running pytest unit tests"
 	cd $(SRC) && \
@@ -106,12 +13,3 @@ pytest: test_requirements
 	 --cov-report xml \
 	 --cov-report term-missing \
 	 --cov .)
-
-clean:
-	@echo "Cleaning out generated files"
-	@rm -rf ./app/{.coverage,htmlcov,coverage.xml}
-	@find . -name \*.pyc -exec rm {} \;
-	@find . -name \*.log -exec rm {} \;
-	@find . -name \*~ -exec rm {} \;
-	@find . -name results.xml -exec rm {} \;
-	@find . -name __pycache__ -exec rm -fr {} \;
diff --git a/images/nagios/Dockerfile b/images/nagios/Dockerfile
@@ -33,7 +33,7 @@ RUN addgroup -g $NAGIOS_GID nagios && \
       nagios-plugins-mysql=$PLUGINS_VERSION \
       nrpe-plugin bash curl fcgiwrap file mariadb-client nginx openssl \
       perl-crypt-x509 perl-libwww perl-text-glob perl-timedate \
-      php82 php82-fpm py3-pip py3-pymysql python3 ssmtp tzdata && \
+      php83 php83-fpm py3-pip py3-pymysql python3 ssmtp tzdata && \
     addgroup nginx nagios && \
     chmod u+s /usr/lib/nagios/plugins/check_ping && \
     sed -i -e s/use_syslog=.*/use_syslog=0/ \
@@ -48,6 +48,6 @@ EXPOSE 80
 VOLUME /etc/nagios /opt/nagios/plugins /var/nagios
 
 COPY nginx.conf /etc/nginx/http.d/nagios.conf
-COPY php-fpm-www.conf /etc/php82/php-fpm.d/www.conf
+COPY php-fpm-www.conf /etc/php83/php-fpm.d/www.conf
 COPY entrypoint.sh mail.sh /usr/local/bin/
 ENTRYPOINT /usr/local/bin/entrypoint.sh
diff --git a/images/nagios/entrypoint.sh b/images/nagios/entrypoint.sh
@@ -94,7 +94,7 @@ for item in backup hosts services; do
 done
 start-stop-daemon -u nginx -b --exec /usr/bin/fcgiwrap -- \
   -s unix:/run/fcgiwrap/fcgiwrap.sock
-/usr/sbin/php-fpm82
+/usr/sbin/php-fpm83
 /usr/sbin/nginx
 touch /var/nagios/nagios.log && tail -1 -f /var/nagios/nagios.log &
 find /var/nagios -not -user nagios -exec chown nagios:nagios {} \;

diff --git a/images/rsyslogd/Dockerfile b/images/rsyslogd/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.23
+FROM alpine:3.22
 ARG BUILD_DATE
 ARG VCS_REF
 LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \
@@ -7,7 +7,7 @@ LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools
 
-ARG RSYSLOG_VERSION=8.2506.0-r0
+ARG RSYSLOG_VERSION=8.2410.0-r1
 ENV TZ=UTC
 RUN apk add --update gzip logrotate rsyslog=$RSYSLOG_VERSION \
       rsyslog-mysql=$RSYSLOG_VERSION tar xz && \

diff --git a/images/rsyslogd/helm/Chart.yaml b/images/rsyslogd/helm/Chart.yaml
@@ -7,7 +7,8 @@ sources:
 - https://github.com/rsyslog/rsyslog
 type: application
 version: 0.1.14
-appVersion: "8.2506.0-r0"
+  # appVersion: "8.2506.0-r0"
+appVersion: "8.2410.0-r1"
 dependencies:
 - name: chartlib
   version: 0.1.8

diff --git a/k8s/helm/splunk/values.yaml b/k8s/helm/splunk/values.yaml
@@ -18,6 +18,7 @@ statefulset:
   env:
     splunk_add: tcp 1514
     splunk_enable_listen: "9997"
+    splunk_general_terms: --accept-sgt-current-at-splunk-com
     splunk_password: changeme
     splunk_start_args: --accept-license --answer-yes
   containerPorts: