diff --git a/.image-gitlab-ci.yml b/.image-gitlab-ci.yml index 15932fb1..5b654aa3 100644 --- a/.image-gitlab-ci.yml +++ b/.image-gitlab-ci.yml @@ -3,7 +3,7 @@ variables: IMAGE: {{ IMAGE }} PLATFORMS: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7 REGISTRY: $REGISTRY_URI/$CI_PROJECT_PATH - TRIVY_VERSION: 0.73.0 + TRIVY_VERSION: 0.74.0 stages: - Static Code Analysis diff --git a/ansible/requirements.txt b/ansible/requirements.txt index 773aae63..1f2cca5e 100644 --- a/ansible/requirements.txt +++ b/ansible/requirements.txt @@ -1,3 +1,3 @@ -ansible==14.2.0 -ansible-lint==26.6.0 -pip==26.1.2 +ansible==14.3.1 +ansible-lint==26.8.0 +pip==26.2.1 diff --git a/images/data-sync/Dockerfile b/images/data-sync/Dockerfile index 140dafd6..c8cc511a 100644 --- a/images/data-sync/Dockerfile +++ b/images/data-sync/Dockerfile @@ -22,7 +22,7 @@ ARG UNISON_SHA=0f14154611a2dfebb8c229be85ceda29a750eace4fb75d06e0d43fe5b58a6e87 ARG RRSYNC_SHA=b745a37909fc10087cc9c901ad7dfda8ad8b6b493097b156b68ba33db4a5a52f COPY src/ /root/src/ -RUN apk add --update openssh-client openssh-server perl rsync && \ +RUN apk add -u --no-cache openssh-client openssh-server perl rsync && \ cd /usr/local/bin && \ wget -q https://raw.githubusercontent.com/instantlinux/docker-tools/master/ansible/roles/docker_node/files/rrsync && \ echo "$RRSYNC_SHA rrsync" | sha256sum -c && \ @@ -36,8 +36,7 @@ RUN apk add --update openssh-client openssh-server perl rsync && \ tar zxf unison.tar.gz --strip-components=1 && \ make && cp src/unison src/unison-fsmonitor /usr/bin && \ cd .. && apk del .fetch-deps && \ - rm -fr /build /var/log/* /var/cache/apk/* && \ - mkdir /var/log/unison /root/.unison + rm -fr /build /var/log/* && mkdir /var/log/unison /root/.unison EXPOSE 22 VOLUME /etc/ssh /etc/unison.d /root/.unison /var/data-sync /var/log/unison diff --git a/images/ddclient/Dockerfile b/images/ddclient/Dockerfile index f2468fc9..21d94fb3 100644 --- a/images/ddclient/Dockerfile +++ b/images/ddclient/Dockerfile @@ -18,7 +18,7 @@ ENV HOST= \ USER_LOGIN= \ USER_SECRETNAME=ddclient-user -RUN apk add --no-cache --update curl ddclient=$DDCLIENT_VERSION \ +RUN apk add -u --no-cache curl ddclient=$DDCLIENT_VERSION \ su-exec && \ mv /etc/ddclient/ddclient.conf /etc/ddclient/ddclient.conf-dist && \ chown ddclient /var/cache/ddclient diff --git a/images/dhcpd-dns-pxe/Dockerfile b/images/dhcpd-dns-pxe/Dockerfile index 4230bcbf..c1f4e1af 100644 --- a/images/dhcpd-dns-pxe/Dockerfile +++ b/images/dhcpd-dns-pxe/Dockerfile @@ -41,7 +41,7 @@ ENV DB_HOST=db00 \ RUN echo "@edge https://dl-cdn.alpinelinux.org/alpine/edge/main" \ >> /etc/apk/repositories && \ - apk add --no-cache --update kea=$KEA_VERSION dnsmasq@edge=$DNSMASQ_VERSION \ + apk add -u --no-cache kea=$KEA_VERSION dnsmasq@edge=$DNSMASQ_VERSION \ kea-admin kea-hook-mysql mariadb-client && \ mkdir -m 755 /run/kea && chown kea /run/kea diff --git a/images/dovecot/Dockerfile b/images/dovecot/Dockerfile index 6227b1c0..e547fba8 100644 --- a/images/dovecot/Dockerfile +++ b/images/dovecot/Dockerfile @@ -1,4 +1,4 @@ -FROM instantlinux/postfix:3.11.4-r0 +FROM instantlinux/postfix:3.11.6-r0 ARG BUILD_DATE ARG VCS_REF @@ -32,7 +32,7 @@ RUN cd /tmp && \ esac && \ echo "@edge https://dl-cdn.alpinelinux.org/alpine/edge/main" \ >> /etc/apk/repositories && \ - apk add --no-cache dovecot@edge=$DOVECOT_VERSION dovecot-ldap@edge=$DOVECOT_VERSION && \ + apk add -u --no-cache dovecot@edge=$DOVECOT_VERSION dovecot-ldap@edge=$DOVECOT_VERSION && \ apk add --allow-untrusted procmail-$PROCMAIL_VERSION.apk && \ cd /usr/local/bin && \ wget -q https://raw.githubusercontent.com/dovecot/core/release-2.4.1/doc/mkcert.sh && \ diff --git a/images/ez-ipupdate/Dockerfile b/images/ez-ipupdate/Dockerfile index a80733a4..87c755a4 100644 --- a/images/ez-ipupdate/Dockerfile +++ b/images/ez-ipupdate/Dockerfile @@ -16,8 +16,8 @@ ENV HOST= \ SERVICE_TYPE=easydns \ USER_SECRETNAME=ez-ipupdate-user -RUN apk add --update curl ez-ipupdate=$EZ_VERSION && \ - rm -fr /var/log/* /var/cache/apk/* +RUN apk add -u --no-cache curl ez-ipupdate=$EZ_VERSION && \ + rm -fr /var/log/* CMD sh -c 'echo "user=`cat /run/secrets/$USER_SECRETNAME`" > /run/ez.conf && \ if [ -z "$HOST" ]; then echo "Please set a HOST name"; exit 1; fi && \ diff --git a/images/git-dump/Dockerfile b/images/git-dump/Dockerfile index 03e026f2..e2ccd884 100644 --- a/images/git-dump/Dockerfile +++ b/images/git-dump/Dockerfile @@ -27,7 +27,7 @@ ARG GID=505 ARG UID=212 COPY *.sh /usr/local/bin/ -RUN apk add --no-cache --update curl dcron git=$GIT_VERSION jq \ +RUN apk add -u --no-cache curl dcron git=$GIT_VERSION jq \ openssh-client tzdata && \ apk upgrade libcrypto3 libssl3 && \ addgroup -g $GID $GROUP && \ diff --git a/images/git-pull/Dockerfile b/images/git-pull/Dockerfile index bf2334f6..16514721 100644 --- a/images/git-pull/Dockerfile +++ b/images/git-pull/Dockerfile @@ -16,8 +16,7 @@ ENV DEST=. \ GIT_REPO=uri \ INTERVAL=0 -RUN apk add --no-cache --update git=$GIT_VERSION openssh-client && \ - apk upgrade libcrypto3 libssl3 +RUN apk add -u --no-cache git=$GIT_VERSION openssh-client VOLUME /git COPY entrypoint.sh /root/ ENTRYPOINT ["/root/entrypoint.sh"] diff --git a/images/mariadb-galera/Dockerfile b/images/mariadb-galera/Dockerfile index 2e23d385..d1e46e81 100644 --- a/images/mariadb-galera/Dockerfile +++ b/images/mariadb-galera/Dockerfile @@ -1,4 +1,4 @@ -FROM mariadb:12.3.2 +FROM mariadb:12.3.3 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ diff --git a/images/mysqldump/Dockerfile b/images/mysqldump/Dockerfile index bd145384..6eda717b 100644 --- a/images/mysqldump/Dockerfile +++ b/images/mysqldump/Dockerfile @@ -28,9 +28,9 @@ RUN RMGROUP=$(grep :$BACKUP_GID: /etc/group | cut -d: -f 1) && \ [ -z "$RMGROUP" ] || delgroup $RMGROUP && \ addgroup -g $BACKUP_GID backup && \ adduser -u $UID -G backup -s /bin/sh -g "MariaDB" -D $USERNAME && \ - apk add --update --no-cache \ + apk add -u --no-cache \ zstd dcron mariadb-client=$CLIENT_VERSION tzdata && \ - rm -fr /var/cache/apk/* /var/log/* + rm -fr /var/log/* COPY *.sh /usr/local/bin/ RUN chmod g+rx,o+rx /usr/local/bin/*.sh diff --git a/images/mythtv-backend/Dockerfile b/images/mythtv-backend/Dockerfile index 62f4bb93..dcd92768 100644 --- a/images/mythtv-backend/Dockerfile +++ b/images/mythtv-backend/Dockerfile @@ -20,7 +20,7 @@ ENV DBNAME=mythtv \ ARG MYTHTV_GID=100 ARG MYTHTV_UID=2021 ARG MYTHTV_PPA=ppa:mythbuntu/36 -ARG MYTHTV_VERSION=2:36.0+fixes.202608010335.0d263282c8~ubuntu26.04.1 +ARG MYTHTV_VERSION=2:36.0+fixes.202608221819.b6ed364d3f~ubuntu26.04.1 ARG MYTHLINK_SHA=459cb8b60adae4b631a95a9cfb1b41dcb959cc4a0b9053582a711d58b8d8a0d2 RUN \ diff --git a/images/mythtv-backend/helm/Chart.yaml b/images/mythtv-backend/helm/Chart.yaml index 6ed63e4b..8e4be4ea 100644 --- a/images/mythtv-backend/helm/Chart.yaml +++ b/images/mythtv-backend/helm/Chart.yaml @@ -6,8 +6,8 @@ sources: - https://github.com/instantlinux/docker-tools - https://github.com/mythtv/mythtv type: application -version: 0.1.22 -appVersion: "36.0-fixes.202608010335.0d263282c8" +version: 0.1.23 +appVersion: "36.0-fixes.202608221819.b6ed364d3f" dependencies: - name: chartlib version: 0.1.8 diff --git a/images/nagios/Dockerfile b/images/nagios/Dockerfile index 7cc73493..e97301f5 100644 --- a/images/nagios/Dockerfile +++ b/images/nagios/Dockerfile @@ -31,7 +31,7 @@ RUN addgroup -g $NAGIOS_GID nagios && \ nagios && \ echo "@edge https://dl-cdn.alpinelinux.org/alpine/edge/main" \ >> /etc/apk/repositories && \ - apk add --update --no-cache nagios@edge=$NAGIOS_VERSION nagios-web \ + apk add -u --no-cache nagios@edge=$NAGIOS_VERSION nagios-web \ nagios-plugins-all=$PLUGINS_VERSION \ nagios-plugins-mysql=$PLUGINS_VERSION \ nrpe-plugin bash curl fcgiwrap file mariadb-client nginx openssl \ diff --git a/images/nagiosql/Dockerfile b/images/nagiosql/Dockerfile index 78a195f8..f86fd615 100644 --- a/images/nagiosql/Dockerfile +++ b/images/nagiosql/Dockerfile @@ -31,7 +31,7 @@ COPY html /var/www/html RUN addgroup -g $NAGIOS_GID nagios && \ adduser -u $APACHE_UID -g Apache -DSH -h /var/www apache && \ adduser -u $NAGIOS_UID -g "Nagios Server" -DSH -h /var/nagios nagios && \ - apk add --update --no-cache apache2 curl nagios=$NAGIOS_VERSION php83 \ + apk add -u --no-cache apache2 curl nagios=$NAGIOS_VERSION php83 \ php83-apache2 php83-ftp php83-gettext php83-mysqli php83-pear php83-session \ php83-pecl-ssh2 tzdata && \ addgroup apache nagios && \ diff --git a/images/nut-upsd/Dockerfile b/images/nut-upsd/Dockerfile index ef023c41..c9cd851d 100644 --- a/images/nut-upsd/Dockerfile +++ b/images/nut-upsd/Dockerfile @@ -38,7 +38,7 @@ HEALTHCHECK CMD upsc $NAME@localhost:3493 2>&1|grep -q stale && \ RUN echo "@edge https://dl-cdn.alpinelinux.org/alpine/edge/community" \ >> /etc/apk/repositories && \ apk add --no-cache dash && \ - apk add --update --no-cache nut@edge=$NUT_VERSION \ + apk add -u --no-cache nut@edge=$NUT_VERSION \ busybox curl linux-pam libcrypto3 libexpat libssl3 libusb musl \ net-snmp-libs util-linux musl-utils nghttp2-libs diff --git a/images/openldap/Dockerfile b/images/openldap/Dockerfile index aef6f4e2..61fac43e 100644 --- a/images/openldap/Dockerfile +++ b/images/openldap/Dockerfile @@ -28,7 +28,7 @@ ENV SLAPD_DN_ATTR=uid \ SLAPD_ULIMIT=2048 \ SLAPD_USERPW_SECRETNAME=openldap-user-passwords -RUN apk add --update --no-cache gettext gzip openldap=$OPENLDAP_VERSION \ +RUN apk add -u --no-cache gettext gzip openldap=$OPENLDAP_VERSION \ openldap-clients openldap-back-mdb openldap-passwd-pbkdf2 \ openldap-overlay-auditlog openldap-overlay-memberof \ openldap-overlay-ppolicy openldap-overlay-refint diff --git a/images/postfix-python/Dockerfile b/images/postfix-python/Dockerfile index 1a441481..c52a8442 100644 --- a/images/postfix-python/Dockerfile +++ b/images/postfix-python/Dockerfile @@ -27,7 +27,7 @@ ARG PYTHON_PIP_VERSION=25.0.1 COPY requirements.txt /root/ COPY src/ /usr/local/bin/ -RUN apk add --no-cache --update \ +RUN apk add -u --no-cache \ curl openssl python3 python3-dev py3-configobj && \ mkdir build && cd build && \ wget -q -O get-pip.py $GETPIP_URI && \ diff --git a/images/postfix/Dockerfile b/images/postfix/Dockerfile index 7dacfd2f..d3085b84 100644 --- a/images/postfix/Dockerfile +++ b/images/postfix/Dockerfile @@ -12,7 +12,7 @@ ARG POSTFIX_VERSION=3.11.6-r0 ENV SASL_SECRETNAME=postfix-sasl-passwd \ TZ=UTC -RUN apk add --no-cache --update \ +RUN apk add -u --no-cache \ postfix=$POSTFIX_VERSION cyrus-sasl-login rsyslog \ spamassassin-client tzdata diff --git a/images/proftpd/Dockerfile b/images/proftpd/Dockerfile index 986bb533..aafd7e81 100644 --- a/images/proftpd/Dockerfile +++ b/images/proftpd/Dockerfile @@ -31,12 +31,8 @@ ENV ALLOW_OVERWRITE=on \ COPY proftpd.conf.j2 /etc/proftpd/proftpd.conf RUN chmod 644 /etc/proftpd/proftpd.conf && \ - apk add --update \ - libcrypto3 \ - proftpd=$PROFTPD_VERSION \ - tzdata \ - proftpd-mod_sftp \ - openssh-keygen + apk add -u --no-cache \ + proftpd=$PROFTPD_VERSION proftpd-mod_sftp openssh-keygen tzdata VOLUME /etc/proftpd/conf.d /etc/proftpd/modules.d /var/lib/ftp /etc/ssh EXPOSE 21 $SFTP_PORT $PASV_MIN_PORT-$PASV_MAX_PORT diff --git a/images/rsyslogd/Dockerfile b/images/rsyslogd/Dockerfile index 3e82a72e..f0ae57ce 100644 --- a/images/rsyslogd/Dockerfile +++ b/images/rsyslogd/Dockerfile @@ -10,9 +10,9 @@ LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ ARG RSYSLOG_VERSION=8.2604.0-r0 ENV TZ=UTC -RUN apk add --update gzip logrotate rsyslog=$RSYSLOG_VERSION \ +RUN apk add -u --no-cache gzip logrotate rsyslog=$RSYSLOG_VERSION \ rsyslog-mysql=$RSYSLOG_VERSION tar xz && \ - rm -fr /var/log/* /var/cache/apk/* + rm -fr /var/log/* VOLUME /var/log /etc/logrotate.d /etc/rsyslog.d EXPOSE 514 514/udp COPY logrotate.conf /etc/logrotate.conf diff --git a/images/samba-dc/Dockerfile b/images/samba-dc/Dockerfile index 653269c2..ba770fc4 100644 --- a/images/samba-dc/Dockerfile +++ b/images/samba-dc/Dockerfile @@ -29,7 +29,7 @@ ARG SAMBA_VERSION=4.23.8-r0 COPY *.conf.j2 /root/ COPY entrypoint.sh /usr/local/bin/ -RUN apk add --update --no-cache krb5 ldb-tools samba-dc=$SAMBA_VERSION \ +RUN apk add -u --no-cache krb5 ldb-tools samba-dc=$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 65841dab..5cc28628 100644 --- a/images/samba/Dockerfile +++ b/images/samba/Dockerfile @@ -16,7 +16,7 @@ ENV LOGON_DRIVE=H \ TZ=UTC \ WORKGROUP=WORKGROUP -RUN apk add --update --no-cache samba=$SAMBA_VERSION shadow tzdata +RUN apk add -u --no-cache samba=$SAMBA_VERSION shadow tzdata VOLUME /etc/samba/conf.d /var/log/samba EXPOSE 137-138/udp 139 445 diff --git a/images/udp-nginx-proxy/Dockerfile b/images/udp-nginx-proxy/Dockerfile index 75108745..764cabd3 100644 --- a/images/udp-nginx-proxy/Dockerfile +++ b/images/udp-nginx-proxy/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.27.4-alpine +FROM nginx:1.31.4-alpine ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ diff --git a/images/vsftpd/Dockerfile b/images/vsftpd/Dockerfile index f4f8247c..f17063e0 100644 --- a/images/vsftpd/Dockerfile +++ b/images/vsftpd/Dockerfile @@ -1,5 +1,4 @@ -FROM alpine:3.23 -MAINTAINER Rich Braun "docker@instantlinux.net" +FROM alpine:3.24 ARG BUILD_DATE ARG VCS_REF LABEL org.opencontainers.image.authors="Rich Braun docker@instantlinux.net" \ @@ -27,7 +26,7 @@ ENV ANONYMOUS_ENABLE=YES \ VSFTPD_LOG_FILE=/dev/stdout \ WRITE_ENABLE=YES -RUN apk add --update --no-cache tzdata vsftpd=$VSFTPD_VERSION +RUN apk add -u --no-cache tzdata vsftpd=$VSFTPD_VERSION VOLUME /etc/vsftpd.d /var/lib/ftp EXPOSE 21 $PASV_MIN_PORT-$PASV_MAX_PORT diff --git a/images/weewx/Dockerfile b/images/weewx/Dockerfile index 1bc54d72..6737c405 100644 --- a/images/weewx/Dockerfile +++ b/images/weewx/Dockerfile @@ -47,7 +47,7 @@ ENV AIRLINK_HOST= \ WX_ROOT=/home/weewx/weewx-data \ WX_USER=weewx -ARG WEEWX_VERSION=5.4.0 +ARG WEEWX_VERSION=5.5.0 ARG WEEGREEN_VERSION=v0.12 ARG AIRLINK_VERSION=1.4 ARG WX_GROUP=dialout @@ -55,7 +55,7 @@ ARG WX_UID=2071 ARG AIRLINK_SHA=6392ee1d8e96a543306f16430ec9095b79dd7d0aacf8078171aa61b060a49745 COPY install-input.txt entrypoint.sh log.conf /tmp -RUN apk add --no-cache --update \ +RUN apk add -u --no-cache \ curl freetype libjpeg libstdc++ openssh openssl python3 \ py3-configobj py3-mysqlclient py3-pillow py3-pymysql py3-pyserial \ py3-requests py3-six py3-usb rsync rsyslog tzdata && \ diff --git a/images/weewx/helm/Chart.yaml b/images/weewx/helm/Chart.yaml index 8244f79e..7c8a61e9 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.10 -appVersion: "5.4.0" +version: 0.1.11 +appVersion: "5.5.0" dependencies: - name: chartlib version: 0.1.8