From 947e372ac03909ff749b70aeddf9e3719046e277 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Sat, 4 Jul 2026 08:56:31 -0700 Subject: [PATCH 1/5] SYS-694 more image updates for alpine 3.24 --- .image-gitlab-ci.yml | 2 +- images/ez-ipupdate/Dockerfile | 2 +- images/mt-daapd/Dockerfile | 27 ------------ images/mt-daapd/Makefile | 1 - images/mt-daapd/README.md | 36 ---------------- images/mt-daapd/docker-compose.yml | 16 ------- images/mt-daapd/entrypoint.sh | 9 ---- images/mt-daapd/helm/.helmignore | 3 -- images/mt-daapd/helm/Chart.yaml | 14 ------ images/mt-daapd/helm/templates/NOTES.txt | 28 ------------ images/mt-daapd/helm/templates/app.yaml | 11 ----- .../helm/templates/tests/test-connection.yaml | 17 -------- images/mt-daapd/helm/values.yaml | 43 ------------------- images/mt-daapd/hooks/add_tags | 3 -- images/mt-daapd/hooks/build | 1 - images/mythtv-backend/Dockerfile | 1 - images/nagiosql/Dockerfile | 4 +- images/nut-upsd/Dockerfile | 12 ++---- 18 files changed, 8 insertions(+), 222 deletions(-) delete mode 100644 images/mt-daapd/Dockerfile delete mode 100644 images/mt-daapd/Makefile delete mode 100644 images/mt-daapd/README.md delete mode 100644 images/mt-daapd/docker-compose.yml delete mode 100755 images/mt-daapd/entrypoint.sh delete mode 100644 images/mt-daapd/helm/.helmignore delete mode 100644 images/mt-daapd/helm/Chart.yaml delete mode 100644 images/mt-daapd/helm/templates/NOTES.txt delete mode 100644 images/mt-daapd/helm/templates/app.yaml delete mode 100644 images/mt-daapd/helm/templates/tests/test-connection.yaml delete mode 100644 images/mt-daapd/helm/values.yaml delete mode 100755 images/mt-daapd/hooks/add_tags delete mode 120000 images/mt-daapd/hooks/build diff --git a/.image-gitlab-ci.yml b/.image-gitlab-ci.yml index 4cdad22b..5053eb6c 100644 --- a/.image-gitlab-ci.yml +++ b/.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 diff --git a/images/ez-ipupdate/Dockerfile b/images/ez-ipupdate/Dockerfile index 288b06aa..41b5012c 100644 --- a/images/ez-ipupdate/Dockerfile +++ b/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" \ diff --git a/images/mt-daapd/Dockerfile b/images/mt-daapd/Dockerfile deleted file mode 100644 index d2d28e2c..00000000 --- a/images/mt-daapd/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -# TODO: this dockerfile is obsoleted by the code maintainer and will -# require install-from-source because debian repo no longer includes -# either forked-daapd or owntone. -# https://owntone.github.io/owntone-server/installation/ -FROM debian:buster-slim -MAINTAINER Rich Braun -ARG BUILD_DATE -ARG VCS_REF -LABEL org.label-schema.build-date=$BUILD_DATE \ - org.label-schema.license=GPL-2.0 \ - org.label-schema.name=mt-daapd \ - org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools - -ENV SERVER_BANNER="Firefly Media on Ubuntu" -ARG DAAPD_VERSION=26.4+dfsg1-1 - -RUN apt-get -yq update && apt-get install -yq --no-install-recommends \ - forked-daapd=$DAAPD_VERSION avahi-daemon && \ - mkdir /root/.config && chown daapd /root/.config && chmod 755 /root && \ - apt-get clean && rm -fr /var/lib/apt/lists/* /var/log/* - -VOLUME ["/srv/music", "/var/cache/forked-daapd", "/var/log"] -EXPOSE 3689 - -COPY entrypoint.sh /usr/local/bin/ -ENTRYPOINT ["/usr/local/bin/entrypoint.sh"] diff --git a/images/mt-daapd/Makefile b/images/mt-daapd/Makefile deleted file mode 100644 index ae6ab3bf..00000000 --- a/images/mt-daapd/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../lib/build/Makefile.docker_image diff --git a/images/mt-daapd/README.md b/images/mt-daapd/README.md deleted file mode 100644 index 7df88fe3..00000000 --- a/images/mt-daapd/README.md +++ /dev/null @@ -1,36 +0,0 @@ -## mt-daapd -[![](https://img.shields.io/docker/v/instantlinux/mt-daapd?sort=date)](https://hub.docker.com/r/instantlinux/mt-daapd/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/mt-daapd?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/mt-daapd "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20arm%2Fv6%20arm%2Fv7-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/mt-daapd/Dockerfile "dockerfile") - -### Status -This is a legacy image, discontinued after 0.26.4+dfsg1 in 2020. A compatible replacement is at [owntone/owntone](https://hub.docker.com/r/owntone/owntone). You can launch that image using the helm chart provided [here](https://github.com/instantlinux/docker-tools/tree/main/k8s/helm/owntone). - -### Introduction -This is Ron Pedde's [Firefly Media server](https://en.wikipedia.org/wiki/Firefly_Media_Server) which implements the Digital Audio Access Protocol for serving MP3 and other audio media formats from a directory mounted to this container onto a LAN. - -Devices such as Roku, Sonos and other brands of audio players or applications such as the Amarok music play for Linux will be able to connect to this service using mDNS/DNS-SD (Avahi). - -Requires --net=host in order to support mDNS. See the [kubernetes.yaml](https://github.com/instantlinux/docker-tools/blob/main/images/mt-daapd/kubernetes.yaml) or [helm](https://github.com/instantlinux/docker-tools/tree/main/images/mt-daapd/helm) / [docker-compose.yml](docker-compose.yml) file for examples. To start, set environment variables as desired and invoke this: - -~~~ -docker-compose up -d -~~~ -or under Kubernetes customize [Makefile.vars](https://github.com/instantlinux/docker-tools/blob/main/k8s/Makefile.vars) and invoke _make_ after cloning this repo: -~~~ -git clone https://github.com/instantlinux/docker-tools.git -cd docker-tools/k8s -make mt-daapd -~~~ - -Volume attachments: mount the media as /srv/music; add an index cache mount /var/cache/forked-daapd and a log path /var/log if avahi logging is desired. Most activity is logged to the container's standard output. - -### Variables - -| Variable | Default | Description | -| -------- | ------- | ----------- | -| SERVER_BANNER | Firefly Media on Ubuntu | Name of service | - -### Contributing - -If you want to make improvements to this image, see [CONTRIBUTING](https://github.com/instantlinux/docker-tools/blob/main/CONTRIBUTING.md). - -[![](https://img.shields.io/badge/license-GPL--2.0-red.svg)](https://choosealicense.com/licenses/gpl-2.0/ "License badge") [![](https://img.shields.io/badge/code-ejurgensen%2Fforked_daapd-blue.svg)](https://github.com/ejurgensen/forked-daapd "Code repo") diff --git a/images/mt-daapd/docker-compose.yml b/images/mt-daapd/docker-compose.yml deleted file mode 100644 index 61db3796..00000000 --- a/images/mt-daapd/docker-compose.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: "3.1" - -services: - app: - image: instantlinux/mt-daapd:latest - restart: always - hostname: ${HOST:-mt-daapd} - environment: - SERVER_BANNER: "%h Firefly MP3 via Docker" - volumes: - - /pc/MP3:/srv/music:ro - - cache:/var/cache/forked-daapd - network_mode: host - -volumes: - cache: diff --git a/images/mt-daapd/entrypoint.sh b/images/mt-daapd/entrypoint.sh deleted file mode 100755 index 1bfb7d55..00000000 --- a/images/mt-daapd/entrypoint.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -sed -i -e "s/name = \"My Music on %h\"/name = \"${SERVER_BANNER}\"/" /etc/forked-daapd.conf -chown -R daapd /var/cache/forked-daapd -mkdir -p /var/run/dbus -[ -e /var/run/dbus/pid ] && rm /var/run/dbus/pid -/usr/bin/dbus-daemon --system -/usr/sbin/avahi-daemon --no-chroot -D -/usr/sbin/forked-daapd -f -c /etc/forked-daapd.conf diff --git a/images/mt-daapd/helm/.helmignore b/images/mt-daapd/helm/.helmignore deleted file mode 100644 index 4844e549..00000000 --- a/images/mt-daapd/helm/.helmignore +++ /dev/null @@ -1,3 +0,0 @@ -*~ -*.txt -.git diff --git a/images/mt-daapd/helm/Chart.yaml b/images/mt-daapd/helm/Chart.yaml deleted file mode 100644 index 86bd7fac..00000000 --- a/images/mt-daapd/helm/Chart.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v2 -name: mt-daapd -description: Dynamic-DNS client -home: https://github.com/instantlinux/docker-tools -sources: -- https://github.com/instantlinux/docker-tools -- https://sourceforge.net/projects/mt-daapd/ -type: application -version: 0.1.2 -appVersion: "26.4-dfsg1-1" -dependencies: -- name: chartlib - version: 0.1.8 - repository: https://instantlinux.github.io/docker-tools diff --git a/images/mt-daapd/helm/templates/NOTES.txt b/images/mt-daapd/helm/templates/NOTES.txt deleted file mode 100644 index 62ea3f4b..00000000 --- a/images/mt-daapd/helm/templates/NOTES.txt +++ /dev/null @@ -1,28 +0,0 @@ -{{- if hasKey .Values "service" }} -{{- if or .Values.service.enabled (not (hasKey .Values.service "enabled")) }} -1. Get the application URL by running these commands: -{{- if hasKey .Values "ingress" }} -{{- if .Values.ingress.enabled }} -{{- range $host := .Values.ingress.hosts }} - {{- range .paths }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} - {{- end }} -{{- end }} -{{- else if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "local.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "local.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "local.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "local.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") - export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT -{{- end }} -{{- end }} -{{- end }} -{{- end }} diff --git a/images/mt-daapd/helm/templates/app.yaml b/images/mt-daapd/helm/templates/app.yaml deleted file mode 100644 index 5b83e9c4..00000000 --- a/images/mt-daapd/helm/templates/app.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{- include "chartlib.deployment" . }} ---- -{{- include "chartlib.hpa" . }} ---- -{{- include "chartlib.ingress" . }} ---- -{{- include "chartlib.ingresstotp" . }} ---- -{{- include "chartlib.service" . }} ---- -{{- include "chartlib.serviceaccount" . }} diff --git a/images/mt-daapd/helm/templates/tests/test-connection.yaml b/images/mt-daapd/helm/templates/tests/test-connection.yaml deleted file mode 100644 index ae159a4f..00000000 --- a/images/mt-daapd/helm/templates/tests/test-connection.yaml +++ /dev/null @@ -1,17 +0,0 @@ -{{- if hasKey .Values "service" }} -apiVersion: v1 -kind: Pod -metadata: - name: "{{ include "local.fullname" . }}-test-connection" - labels: - {{- include "local.labels" . | nindent 4 }} - annotations: - "helm.sh/hook": test -spec: - containers: - - name: wget - image: busybox - command: ['wget'] - args: ['{{ include "local.fullname" . }}:{{ .Values.service.port }}'] - restartPolicy: Never -{{- end }} diff --git a/images/mt-daapd/helm/values.yaml b/images/mt-daapd/helm/values.yaml deleted file mode 100644 index 3dfc0f75..00000000 --- a/images/mt-daapd/helm/values.yaml +++ /dev/null @@ -1,43 +0,0 @@ -# Default values for mt-daapd. -deployment: - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app.kubernetes.io/name - operator: In - values: - - mt-daapd - topologyKey: "kubernetes.io/hostname" - env: - server_banner: "%h Firefly MP3 via Docker" - hostNetwork: true - nodeSelector: - service.mt-daapd: allow - replicas: 2 - -volumeMounts: -- name: cache - mountPath: /var/cache/forked-daapd -- name: music - mountPath: /srv/music - readOnly: true -volumes: -- name: cache - emptyDir: {} -- name: music - persistentVolumeClaim: - claimName: mp3 - -image: - repository: instantlinux/mt-daapd - pullPolicy: IfNotPresent - # tag: default - -nameOverride: "" -fullnameOverride: "" - -serviceAccount: {} -autoscaling: - enabled: false diff --git a/images/mt-daapd/hooks/add_tags b/images/mt-daapd/hooks/add_tags deleted file mode 100755 index 0ddb98ee..00000000 --- a/images/mt-daapd/hooks/add_tags +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -TAG=$(grep "ARG .*_VERSION" Dockerfile | sed -e s/+/-/ | cut -d= -f 2) -echo "--tag $DOCKER_REPO:$TAG" diff --git a/images/mt-daapd/hooks/build b/images/mt-daapd/hooks/build deleted file mode 120000 index acded15a..00000000 --- a/images/mt-daapd/hooks/build +++ /dev/null @@ -1 +0,0 @@ -../../../lib/build/dockerhub-hook \ No newline at end of file diff --git a/images/mythtv-backend/Dockerfile b/images/mythtv-backend/Dockerfile index b3702f82..dcc72a4a 100644 --- a/images/mythtv-backend/Dockerfile +++ b/images/mythtv-backend/Dockerfile @@ -38,7 +38,6 @@ RUN \ vim xmltv COPY src/ /root/ - RUN \ usermod -u $MYTHTV_UID -s /bin/bash mythtv && \ mkdir -p /var/lib/mythtv && \ diff --git a/images/nagiosql/Dockerfile b/images/nagiosql/Dockerfile index bbc977db..d89b7fa1 100644 --- a/images/nagiosql/Dockerfile +++ b/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 diff --git a/images/nut-upsd/Dockerfile b/images/nut-upsd/Dockerfile index f751afb5..aa1567a4 100644 --- a/images/nut-upsd/Dockerfile +++ b/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/ From 755c3a1b044bd5be6b86f9cd8186f8e46a253d78 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Sat, 4 Jul 2026 21:50:53 -0700 Subject: [PATCH 2/5] SYS-694 wip --- .image-gitlab-ci.yml | 3 --- images/mythtv-backend/Dockerfile | 3 ++- images/weewx/Dockerfile | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.image-gitlab-ci.yml b/.image-gitlab-ci.yml index 5053eb6c..9ed2ae21 100644 --- a/.image-gitlab-ci.yml +++ b/.image-gitlab-ci.yml @@ -51,12 +51,9 @@ 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-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 # 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 diff --git a/images/mythtv-backend/Dockerfile b/images/mythtv-backend/Dockerfile index dcc72a4a..a284c63f 100644 --- a/images/mythtv-backend/Dockerfile +++ b/images/mythtv-backend/Dockerfile @@ -35,7 +35,8 @@ RUN \ mythtv-backend=$MYTHTV_VERSION \ mythtv-common=$MYTHTV_VERSION mythtv-transcode-utils=$MYTHTV_VERSION \ libmyth-python libmythtv-perl libjson-xs-perl psmisc sudo tzdata v4l-utils \ - vim xmltv + vim xmltv && \ + apt purge pebble COPY src/ /root/ RUN \ diff --git a/images/weewx/Dockerfile b/images/weewx/Dockerfile index fef33a29..afd2b54c 100644 --- a/images/weewx/Dockerfile +++ b/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 From ab2a756b12cae511bc40907bfd81ddeaaa29ef3c Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Sat, 4 Jul 2026 22:30:38 -0700 Subject: [PATCH 3/5] SYS-694 wip --- images/haproxy-keepalived/Dockerfile | 4 ++-- images/haproxy-keepalived/helm/Chart.yaml | 4 ++-- images/mythtv-backend/Dockerfile | 4 ++-- images/weewx/helm/Chart.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/images/haproxy-keepalived/Dockerfile b/images/haproxy-keepalived/Dockerfile index 0515ad95..4a0c8005 100644 --- a/images/haproxy-keepalived/Dockerfile +++ b/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 \ diff --git a/images/haproxy-keepalived/helm/Chart.yaml b/images/haproxy-keepalived/helm/Chart.yaml index 11105e93..9209c281 100644 --- a/images/haproxy-keepalived/helm/Chart.yaml +++ b/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 diff --git a/images/mythtv-backend/Dockerfile b/images/mythtv-backend/Dockerfile index a284c63f..319d0893 100644 --- a/images/mythtv-backend/Dockerfile +++ b/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 /bin/pebble /usr/bin/pebble && \ apt-get -yq update && \ apt-get install -yq gnupg locales software-properties-common wget && \ add-apt-repository $MYTHTV_PPA && \ @@ -35,8 +36,7 @@ RUN \ mythtv-backend=$MYTHTV_VERSION \ mythtv-common=$MYTHTV_VERSION mythtv-transcode-utils=$MYTHTV_VERSION \ libmyth-python libmythtv-perl libjson-xs-perl psmisc sudo tzdata v4l-utils \ - vim xmltv && \ - apt purge pebble + vim xmltv COPY src/ /root/ RUN \ diff --git a/images/weewx/helm/Chart.yaml b/images/weewx/helm/Chart.yaml index deef6fa9..8244f79e 100644 --- a/images/weewx/helm/Chart.yaml +++ b/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 From dbafcbc64f600bdae8e63b2435a57142ff976b10 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Sat, 4 Jul 2026 22:39:37 -0700 Subject: [PATCH 4/5] SYS-694 wip --- images/mythtv-backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/mythtv-backend/Dockerfile b/images/mythtv-backend/Dockerfile index 319d0893..dc0b6b7f 100644 --- a/images/mythtv-backend/Dockerfile +++ b/images/mythtv-backend/Dockerfile @@ -23,7 +23,7 @@ ARG MYTHTV_VERSION=2:36.0+fixes.202607020123.7153bb6e34~ubuntu26.04.1 ARG MYTHLINK_SHA=459cb8b60adae4b631a95a9cfb1b41dcb959cc4a0b9053582a711d58b8d8a0d2 RUN \ - rm /bin/pebble /usr/bin/pebble && \ + rm /usr/bin/pebble && \ apt-get -yq update && \ apt-get install -yq gnupg locales software-properties-common wget && \ add-apt-repository $MYTHTV_PPA && \ From 96ee31afc16ae378b85c59dee579d1f58136c741 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Sat, 4 Jul 2026 22:56:59 -0700 Subject: [PATCH 5/5] SYS-694 wip --- .image-gitlab-ci.yml | 2 ++ services/Makefile | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.image-gitlab-ci.yml b/.image-gitlab-ci.yml index 9ed2ae21..8843a173 100644 --- a/.image-gitlab-ci.yml +++ b/.image-gitlab-ci.yml @@ -51,9 +51,11 @@ security_scan_trivy: TRIVY_IGNORE: >- CVE-2023-31484,CVE-2023-45853, CVE-2023-52425,CVE-2024-8176, + 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 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 diff --git a/services/Makefile b/services/Makefile index 6d3800f6..831a6a8a 100644 --- a/services/Makefile +++ b/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