SYS-694 more image updates

.image-gitlab-ci.yml

@@ -4,7 +4,7 @@ variables:
   IMAGE: {{ IMAGE }}
   PLATFORMS: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
   REGISTRY: $REGISTRY_URI/$CI_PROJECT_PATH
-  TRIVY_VERSION: 0.70.0
+  TRIVY_VERSION: 0.72.0
 
 stages:
   - Static Code Analysis
@@ -51,12 +51,11 @@ security_scan_trivy:
     TRIVY_IGNORE: >-
       CVE-2023-31484,CVE-2023-45853,
       CVE-2023-52425,CVE-2024-8176,
-      CVE-2025-9900,CVE-2025-68121,CVE-2026-25679,CVE-2026-32280,
-      CVE-2026-32281,CVE-2026-32283,
+      CVE-2025-9900,
       CVE-2026-0861,CVE-2025-8194,CVE-2025-13699,
       CVE-2025-13836,CVE-2025-40914
       # Above two rows are for spamassassin under debian trixie
-      # CVE-2025-9900 and next line are for MythTV 36, unfixed ubuntu:resolute
+      # CVE-2025-9900 is for mythtv-backend
       # Below are for blacklist image, there's a won't-fix note for zlib1g
       # CVE-2023-31484,CVE-2023-45853
     TRIVY_OUTPUT: gl-container-scanning-report.json

images/ez-ipupdate/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.23
+FROM alpine:3.24
 ARG BUILD_DATE
 ARG VCS_REF
 LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \

images/haproxy-keepalived/Dockerfile

@@ -1,4 +1,4 @@
-FROM haproxy:3.3.10-alpine
+FROM haproxy:3.3.11-alpine
 ARG BUILD_DATE
 ARG VCS_REF
 LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \
@@ -8,7 +8,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 KEEPALIVED_VERSION=2.3.4-r3
+ARG KEEPALIVED_VERSION=2.3.4-r2
 ENV KEEPALIVE_CONFIG_ID=main \
     PORT_HAPROXY_STATS=8080 \
     STATS_ENABLE=yes \

images/haproxy-keepalived/helm/Chart.yaml

@@ -7,8 +7,8 @@ sources:
 - https://github.com/haproxy/haproxy
 - https://github.com/acassen/keepalived
 type: application
-version: 0.1.22
-appVersion: "3.3.10-alpine-2.3.4-r3"
+version: 0.1.23
+appVersion: "3.3.11-alpine-2.3.4-r2"
 dependencies:
 - name: chartlib
   version: 0.1.8

images/mythtv-backend/Dockerfile

@@ -23,6 +23,7 @@ ARG MYTHTV_VERSION=2:36.0+fixes.202607020123.7153bb6e34~ubuntu26.04.1
 ARG MYTHLINK_SHA=459cb8b60adae4b631a95a9cfb1b41dcb959cc4a0b9053582a711d58b8d8a0d2
 
 RUN \
+  rm /usr/bin/pebble && \
   apt-get -yq update && \
   apt-get install -yq gnupg locales software-properties-common wget && \
   add-apt-repository $MYTHTV_PPA && \
@@ -38,7 +39,6 @@ RUN \
     vim xmltv
 
 COPY src/ /root/
-
 RUN \
   usermod -u $MYTHTV_UID -s /bin/bash mythtv && \
   mkdir -p /var/lib/mythtv && \

images/nagiosql/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.23
+FROM alpine:3.24
 ARG BUILD_DATE
 ARG VCS_REF
 LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \
@@ -20,7 +20,7 @@ ENV APACHE_BIN=httpd \
 ARG APACHE_UID=33
 ARG NAGIOS_GID=1000
 ARG NAGIOS_UID=999
-ARG NAGIOS_VERSION=4.5.10-r0
+ARG NAGIOS_VERSION=4.5.13-r0
 ARG NAGIOSQL_VERSION=3.5.0
 ARG NAGIOSQL_SHA=f777dfd8152768669ac73d96a6547fc5d8add80f50fb9fb4e255fc4f344d1222
 ARG NAGIOSQL_DOWNLOAD=nagiosql-$NAGIOSQL_VERSION-git2023-06-18.tar.bz2

images/nut-upsd/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.23
+FROM alpine:3.24
 ARG BUILD_DATE
 ARG VCS_REF
 LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \
@@ -34,14 +34,10 @@ ENV ACTIONS= \
 HEALTHCHECK CMD upsc $NAME@localhost:3493 2>&1|grep -q stale && \
     killall -TERM upsmon || true
 
-RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/main' \
-      >>/etc/apk/repositories && \
-    apk add --no-cache dash && \
+RUN apk add --no-cache dash && \
     apk add --update --no-cache nut=$NUT_VERSION \
-      busybox curl@edge linux-pam \
-      libcrypto3 libexpat@edge libssl3 \
-      libusb musl@edge net-snmp-libs util-linux \
-      musl-utils@edge nghttp2-libs@edge
+      busybox curl linux-pam libcrypto3 libexpat libssl3 libusb musl \
+      net-snmp-libs util-linux musl-utils nghttp2-libs
 
 EXPOSE 3493
 COPY entrypoint.sh /usr/local/bin/

images/weewx/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.23
+FROM alpine:3.24
 ARG BUILD_DATE
 ARG VCS_REF
 LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \
@@ -46,7 +46,7 @@ ENV AIRLINK_HOST= \
     WX_ROOT=/home/weewx/weewx-data \
     WX_USER=weewx
 
-ARG WEEWX_VERSION=5.2.0
+ARG WEEWX_VERSION=5.4.0
 ARG WEEGREEN_VERSION=v0.12
 ARG AIRLINK_VERSION=1.4
 ARG WX_GROUP=dialout

images/weewx/helm/Chart.yaml

@@ -6,8 +6,8 @@ sources:
 - https://github.com/instantlinux/docker-tools
 - https://github.com/weewx/weewx/
 type: application
-version: 0.1.9
-appVersion: "5.2.0"
+version: 0.1.10
+appVersion: "5.4.0"
 dependencies:
 - name: chartlib
   version: 0.1.8

services/Makefile

@@ -25,8 +25,3 @@ keycloak::
 	@echo Starting $@
 	@cd $@ ; KEYCLOAK_DB_PASSWORD=$(shell cat \
 	 /var/adm/secrets/keycloak-db-password) docker compose up -d
-
-nagios::
-	@echo Starting $@
-	docker pull $(REGISTRY_URI)/nagiosql:latest; \
-	cd $@ ; docker compose up -d