From 4ef38715da849570440fc73eb07fb23d3098e152 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Wed, 2 Sep 2026 11:29:10 -0700 Subject: [PATCH] SYS-701 vulnerability pruning for remaining images --- images/git-pull/hooks/add_tags | 2 +- images/nagios/Dockerfile | 3 ++- images/nagiosql/Dockerfile | 2 +- images/samba-dc/Dockerfile | 6 ++++-- images/samba/Dockerfile | 6 ++++-- images/weewx/Dockerfile | 3 ++- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/images/git-pull/hooks/add_tags b/images/git-pull/hooks/add_tags index 21f456f9..ff9ebf1d 100755 --- a/images/git-pull/hooks/add_tags +++ b/images/git-pull/hooks/add_tags @@ -1,2 +1,2 @@ #!/bin/sh -# +echo $(grep "ARG .*_VERSION" Dockerfile | cut -d= -f 2) diff --git a/images/nagios/Dockerfile b/images/nagios/Dockerfile index e97301f5..ac9f20ed 100644 --- a/images/nagios/Dockerfile +++ b/images/nagios/Dockerfile @@ -36,7 +36,8 @@ 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 \ - php83 php83-fpm py3-pip py3-pymysql python3 ssmtp tzdata && \ + php83 php83-fpm py3-pip py3-pymysql python3 ssmtp tzdata \ + samba-client@edge && \ addgroup nginx nagios && \ chmod u+s /usr/lib/nagios/plugins/check_ping && \ sed -i -e s/use_syslog=.*/use_syslog=0/ \ diff --git a/images/nagiosql/Dockerfile b/images/nagiosql/Dockerfile index f86fd615..9af7c98f 100644 --- a/images/nagiosql/Dockerfile +++ b/images/nagiosql/Dockerfile @@ -21,7 +21,7 @@ ENV APACHE_BIN=httpd \ ARG APACHE_UID=33 ARG NAGIOS_GID=1000 ARG NAGIOS_UID=999 -ARG NAGIOS_VERSION=4.5.13-r0 +ARG NAGIOS_VERSION=4.5.14-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/samba-dc/Dockerfile b/images/samba-dc/Dockerfile index ba770fc4..89c63f81 100644 --- a/images/samba-dc/Dockerfile +++ b/images/samba-dc/Dockerfile @@ -25,11 +25,13 @@ ENV ADMIN_PASSWORD_SECRET=samba-admin-password \ WINBIND_USE_DEFAULT_DOMAIN=yes \ WORKGROUP=AD -ARG SAMBA_VERSION=4.23.8-r0 +ARG SAMBA_VERSION=4.23.10-r0 COPY *.conf.j2 /root/ COPY entrypoint.sh /usr/local/bin/ -RUN apk add -u --no-cache krb5 ldb-tools samba-dc=$SAMBA_VERSION \ +RUN echo "@edge https://dl-cdn.alpinelinux.org/alpine/edge/main" \ + >> /etc/apk/repositories && \ + apk add -u --no-cache krb5 ldb-tools samba-dc@edge=$SAMBA_VERSION \ samba-winbind-clients=$SAMBA_VERSION tdb bind bind-libs bind-tools \ libcrypto3 libxml2 tzdata py3-cryptography py3-setuptools py3-pip && \ pip install jinjanator --break-system-packages && \ diff --git a/images/samba/Dockerfile b/images/samba/Dockerfile index 5cc28628..2045728a 100644 --- a/images/samba/Dockerfile +++ b/images/samba/Dockerfile @@ -9,14 +9,16 @@ 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 SAMBA_VERSION=4.23.8-r0 +ARG SAMBA_VERSION=4.23.10-r0 ENV LOGON_DRIVE=H \ NETBIOS_NAME=samba \ SERVER_STRING="Samba Server" \ TZ=UTC \ WORKGROUP=WORKGROUP -RUN apk add -u --no-cache samba=$SAMBA_VERSION shadow tzdata +RUN echo "@edge https://dl-cdn.alpinelinux.org/alpine/edge/main" \ + >> /etc/apk/repositories && \ + apk add -u --no-cache samba@edge=$SAMBA_VERSION shadow tzdata VOLUME /etc/samba/conf.d /var/log/samba EXPOSE 137-138/udp 139 445 diff --git a/images/weewx/Dockerfile b/images/weewx/Dockerfile index 6737c405..abb5a306 100644 --- a/images/weewx/Dockerfile +++ b/images/weewx/Dockerfile @@ -65,7 +65,8 @@ RUN apk add -u --no-cache \ VENV=/home/$WX_USER/weewx-venv && \ python3 -m venv $VENV --system-site-packages && \ source $VENV/bin/activate && \ - python3 -m pip install weewx==$WEEWX_VERSION ct3 && \ + pip install weewx==$WEEWX_VERSION ct3 && \ + pip uninstall -y setuptools && \ git clone -b $WEEGREEN_VERSION --depth 1 \ https://github.com/instantlinux/weewx-WeeGreen.git \ $WX_ROOT/skins/WeeGreen && \