From de9d5d5f036a96655a26889169c0a67f7debf074 Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Mon, 20 May 2024 12:28:38 -0700 Subject: [PATCH] SYS-623 updates for dhcpd-dns-pxe, mysqldump, postfix, proftpd, restic --- images/data-sync/helm/values.yaml | 5 +++++ images/dhcpd-dns-pxe/Dockerfile | 2 +- images/dhcpd-dns-pxe/helm/Chart.yaml | 2 +- images/mysqldump/Dockerfile | 2 +- images/mysqldump/helm/Chart.yaml | 4 ++-- images/postfix-python/Dockerfile | 2 +- images/postfix-python/README.md | 2 +- images/postfix-python/helm/Chart.yaml | 4 ++-- images/postfix/Dockerfile | 2 +- images/proftpd/Dockerfile | 2 +- images/proftpd/helm/Chart.yaml | 4 ++-- images/weewx/Dockerfile | 21 ++++++++++++++------- images/weewx/helm/Chart.yaml | 4 ++-- images/weewx/requirements.txt | 2 +- k8s/helm/restic/Chart.yaml | 4 ++-- k8s/helm/restic/values.yaml | 2 +- 16 files changed, 38 insertions(+), 26 deletions(-) diff --git a/images/data-sync/helm/values.yaml b/images/data-sync/helm/values.yaml index e06407a0..55ef75ea 100644 --- a/images/data-sync/helm/values.yaml +++ b/images/data-sync/helm/values.yaml @@ -114,6 +114,7 @@ configmap: ignore = Path data-sync/share/artifactory/data/data/derby/log ignore = Path data-sync/share/artifactory/data/logs/request.log ignore = Path data-sync/share/nagios/var/rw + ignore = Path data-sync/share/openldap/data/lock.mdb ignore = Path data-sync/share/rainloop/data/_data_/_default_/cache ignore = Path data-sync/dos ignore = Path data-sync/gitlab/data/gitaly @@ -125,6 +126,10 @@ configmap: ignore = Path data-sync/jira/home/log/jfr ignore = Path data-sync/jira/logs/access_* ignore = Path data-sync/nexus/db/accesslog + ignore = Path data-sync/nexus/db/analytics/analytics* + ignore = Path data-sync/nexus/db/analytics/metrics_log* + ignore = Path data-sync/nexus/db/config/quartz_trigger* + ignore = Path data-sync/nexus/log/audit/audit.log ignore = Path redis/current ignore = Path data-sync/samba-dc/var/lib/winbindd_privileged/pipe ignore = Path data-sync/syslog/log/messages diff --git a/images/dhcpd-dns-pxe/Dockerfile b/images/dhcpd-dns-pxe/Dockerfile index c8fd8d97..fde33d93 100644 --- a/images/dhcpd-dns-pxe/Dockerfile +++ b/images/dhcpd-dns-pxe/Dockerfile @@ -9,7 +9,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools ARG DHCP_VERSION=4.4.3_p1-r4 -ARG DNSMASQ_VERSION=2.89-r6 +ARG DNSMASQ_VERSION=2.90-r2 ENV DHCP_BOOT=pxelinux.0 \ DHCP_ENABLE=yes \ diff --git a/images/dhcpd-dns-pxe/helm/Chart.yaml b/images/dhcpd-dns-pxe/helm/Chart.yaml index 6d6bb25d..d40fefc4 100644 --- a/images/dhcpd-dns-pxe/helm/Chart.yaml +++ b/images/dhcpd-dns-pxe/helm/Chart.yaml @@ -8,7 +8,7 @@ sources: - http://thekelleys.org.uk/gitweb/?p=dnsmasq.git type: application version: 0.1.10 -appVersion: "4.4.3_p1-r4-2.89-r6" +appVersion: "4.4.3_p1-r4-2.90-r2" dependencies: - name: chartlib version: 0.1.8 diff --git a/images/mysqldump/Dockerfile b/images/mysqldump/Dockerfile index e1d3ccea..c45f6938 100644 --- a/images/mysqldump/Dockerfile +++ b/images/mysqldump/Dockerfile @@ -19,7 +19,7 @@ ENV HOUR=3 MINUTE=30 \ ARG UID=210 ARG BACKUP_GID=34 -ARG CLIENT_VERSION=10.11.5-r3 +ARG CLIENT_VERSION=10.11.6-r0 RUN RMGROUP=$(grep :$BACKUP_GID: /etc/group | cut -d: -f 1) && \ [ -z "$RMGROUP" ] || delgroup $RMGROUP && \ diff --git a/images/mysqldump/helm/Chart.yaml b/images/mysqldump/helm/Chart.yaml index 1693a63e..a0a99a89 100644 --- a/images/mysqldump/helm/Chart.yaml +++ b/images/mysqldump/helm/Chart.yaml @@ -6,8 +6,8 @@ sources: - https://github.com/instantlinux/docker-tools - https://github.com/mariadb/server/tree/10.5/client type: application -version: 0.1.8 -appVersion: "10.11.5-r3" +version: 0.1.9 +appVersion: "10.11.6-r0" dependencies: - name: chartlib version: 0.1.8 diff --git a/images/postfix-python/Dockerfile b/images/postfix-python/Dockerfile index 5022d342..811e776d 100644 --- a/images/postfix-python/Dockerfile +++ b/images/postfix-python/Dockerfile @@ -1,4 +1,4 @@ -ARG POSTFIX_VERSION=3.8.3-r1 +ARG POSTFIX_VERSION=3.8.6-r0 FROM instantlinux/postfix:$POSTFIX_VERSION MAINTAINER Rich Braun "docker@instantlinux.net" diff --git a/images/postfix-python/README.md b/images/postfix-python/README.md index 265e8a18..16981b73 100644 --- a/images/postfix-python/README.md +++ b/images/postfix-python/README.md @@ -1,5 +1,5 @@ ## postfix-python -[![](https://img.shields.io/docker/v/instantlinux/postfix-python?sort=date)](https://hub.docker.com/r/instantlinux/postfix-python/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/postfix-python?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/postfix-python "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/postfix-python/Dockerfile "dockerfile") +[![](https://img.shields.io/docker/v/instantlinux/postfix-python?sort=date)](https://hub.docker.com/r/instantlinux/postfix-python/tags "Version badge") [![](https://img.shields.io/docker/image-size/instantlinux/postfix-python?sort=date)](https://github.com/instantlinux/docker-tools/tree/main/images/postfix-python "Image badge") ![](https://img.shields.io/badge/platform-amd64%20arm64%20aarch64-blue "Platform badge") [![](https://img.shields.io/badge/dockerfile-latest-blue)](https://gitlab.com/instantlinux/docker-tools/-/blob/main/images/postfix-python/Dockerfile "dockerfile") Postfix with python support. (Python needed for blacklist utility.) This repo has complete instructions for [building a kubernetes cluster](https://github.com/instantlinux/docker-tools/blob/main/k8s/README.md) where you can launch with [helm](https://github.com/instantlinux/docker-tools/tree/main/images/postfix-python/helm) or [kubernetes.yaml](https://github.com/instantlinux/docker-tools/blob/main/images/postfix-python/kubernetes.yaml) using _make_ and customizing [Makefile.vars](https://github.com/instantlinux/docker-tools/blob/main/k8s/Makefile.vars) after cloning this repo: diff --git a/images/postfix-python/helm/Chart.yaml b/images/postfix-python/helm/Chart.yaml index 0857f768..8c0ab001 100644 --- a/images/postfix-python/helm/Chart.yaml +++ b/images/postfix-python/helm/Chart.yaml @@ -6,8 +6,8 @@ sources: - https://github.com/instantlinux/docker-tools - https://github.com/vdukhovni/postfix type: application -version: 0.1.11 -appVersion: "3.8.3-r1" +version: 0.1.13 +appVersion: "3.8.6-r0" dependencies: - name: chartlib version: 0.1.8 diff --git a/images/postfix/Dockerfile b/images/postfix/Dockerfile index f1482e61..eb7f6fcb 100644 --- a/images/postfix/Dockerfile +++ b/images/postfix/Dockerfile @@ -8,7 +8,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools -ARG POSTFIX_VERSION=3.8.3-r1 +ARG POSTFIX_VERSION=3.8.6-r0 ENV SASL_PASSWD_SECRET=postfix-sasl-passwd \ TZ=UTC diff --git a/images/proftpd/Dockerfile b/images/proftpd/Dockerfile index a38fd382..c39419af 100644 --- a/images/proftpd/Dockerfile +++ b/images/proftpd/Dockerfile @@ -8,7 +8,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-url=https://github.com/instantlinux/docker-tools -ARG PROFTPD_VERSION=1.3.8a-r1 +ARG PROFTPD_VERSION=1.3.8b-r1 ENV ALLOW_OVERWRITE=on \ ANONYMOUS_DISABLE=off \ ANON_UPLOAD_ENABLE=DenyAll \ diff --git a/images/proftpd/helm/Chart.yaml b/images/proftpd/helm/Chart.yaml index 940ebcf4..b66cf0f5 100644 --- a/images/proftpd/helm/Chart.yaml +++ b/images/proftpd/helm/Chart.yaml @@ -6,8 +6,8 @@ sources: - https://github.com/instantlinux/docker-tools - https://github.com/proftpd/proftpd type: application -version: 0.1.7 -appVersion: "1.3.8a-r1" +version: 0.1.8 +appVersion: "1.3.8b-r1" dependencies: - name: chartlib version: 0.1.8 diff --git a/images/weewx/Dockerfile b/images/weewx/Dockerfile index 63c4c8e4..55f4baa9 100644 --- a/images/weewx/Dockerfile +++ b/images/weewx/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM alpine:3.19 MAINTAINER Rich Braun "docker@instantlinux.net" ARG BUILD_DATE ARG VCS_REF @@ -46,8 +46,8 @@ ENV AIRLINK_HOST= \ WX_USER=weewx \ XTIDE_LOCATION=unset -ARG WEEWX_VERSION=4.10.2 -ARG WEEWX_SHA=d7f445560ac5be6424d4b81995109dcf05bd564a3b2fce201bf58ab46dda43fc +ARG WEEWX_VERSION=5.0.2 +ARG WEEWX_SHA=3e55fdf359b9aa3388a1826f0bfad6665a1a865ddfa521286449bcad036c4262 ARG WEEGREEN_VERSION=v0.12 ARG WX_GROUP=dialout ARG WX_UID=2071 @@ -60,15 +60,22 @@ RUN apk add --no-cache --update \ rsync rsyslog tzdata && \ adduser -u $WX_UID -s /bin/sh -G $WX_GROUP -D $WX_USER && \ mkdir build && cd build && \ - curl -sLo weewx.tar.gz \ - http://www.weewx.com/downloads/released_versions/weewx-$WEEWX_VERSION.tar.gz && \ - echo "$WEEWX_SHA weewx.tar.gz" >> /build/checksums && \ + curl -sLo weewx.tgz \ + http://www.weewx.com/downloads/released_versions/weewx-$WEEWX_VERSION.tgz && \ + echo "$WEEWX_SHA weewx.tgz" >> /build/checksums && \ sha256sum -c /build/checksums && \ apk add --no-cache --virtual .fetch-deps \ file freetype-dev g++ gawk gcc git jpeg-dev libpng-dev make musl-dev \ py3-pip py3-wheel python3-dev zlib-dev && \ + # + # Lots of breaking changes since 4.x, alas: ticket is SYS-623. + # See https://github.com/weewx/weewx/wiki/v5-upgrade + # The setup.py procedure found in 4.x went missing in 5.0 + # + # TODO deal with break-system-packages, no idea what broke pip install -r /root/requirements.txt --break-system-packages && \ - tar xf weewx.tar.gz --strip-components=1 && \ + tar xf weewx.tgz --strip-components=1 && \ + ### TODO 5/20/2024 version 5.0 no longer has setup.py. Build is broken. cd /build && \ ./setup.py build && ./setup.py install < /root/install-input.txt && \ git clone -b $WEEGREEN_VERSION --depth 1 \ diff --git a/images/weewx/helm/Chart.yaml b/images/weewx/helm/Chart.yaml index d8313ab7..9a57497d 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.5 -appVersion: "4.10.2" +version: 0.1.6 +appVersion: "5.0.2" dependencies: - name: chartlib version: 0.1.8 diff --git a/images/weewx/requirements.txt b/images/weewx/requirements.txt index 4c74de86..6e156832 100644 --- a/images/weewx/requirements.txt +++ b/images/weewx/requirements.txt @@ -1,6 +1,6 @@ ephem==3.7.7.1 # These are alpine packages, we just use latest -Cheetah3 +CT3 mysqlclient pillow pyserial diff --git a/k8s/helm/restic/Chart.yaml b/k8s/helm/restic/Chart.yaml index 58054ce2..45e6379e 100644 --- a/k8s/helm/restic/Chart.yaml +++ b/k8s/helm/restic/Chart.yaml @@ -6,10 +6,10 @@ sources: - https://github.com/instantlinux/docker-tools - https://github.com/restic/restic type: application -version: 0.1.7 +version: 0.1.8 # Remember to update restic== in values.yaml as releases are published; # the values.yaml file is not able to reference .Chart.appVersion -appVersion: "0.16.2-r0" +appVersion: "0.16.2-r1" dependencies: - name: chartlib version: 0.1.8 diff --git a/k8s/helm/restic/values.yaml b/k8s/helm/restic/values.yaml index 2605ea3e..356b052e 100644 --- a/k8s/helm/restic/values.yaml +++ b/k8s/helm/restic/values.yaml @@ -16,7 +16,7 @@ deployment: mkdir -p /var/log/week && tail -f -n 0 /var/log/restic.log env: # Edit the version in Chart.yaml to keep consistent - app_version: 0.16.2-r0 + app_version: 0.16.2-r1 env: /etc/profile tz: UTC nodeSelector: