SYS-619 upgrade images to alpine 3.19

images/data-sync/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF
@@ -17,7 +17,7 @@ ENV PEERNAME= \
     SSHKEY2=data-sync-sshkey2
 
 ARG UNISON_VERSION=2.53.3
-ARG OCAML_VERSION=4.14.1-r1
+ARG OCAML_VERSION=4.14.1-r3
 ARG UNISON_SHA=aaea04fc5bc76dcfe8627683c9659ee4c194d4f992cc8aaa15bbb2820fc8de46
 ARG RRSYNC_SHA=b745a37909fc10087cc9c901ad7dfda8ad8b6b493097b156b68ba33db4a5a52f
 

images/data-sync/helm/Chart.yaml

@@ -5,8 +5,8 @@ home: https://github.com/instantlinux/docker-tools
 sources:
 - https://github.com/instantlinux/docker-tools
 type: application
-version: 0.1.10
-appVersion: "2.53.3-4.14.1-r1"
+version: 0.1.12
+appVersion: "2.53.3-4.14.1-r3"
 dependencies:
 - name: chartlib
   version: 0.1.8

images/data-sync/helm/values.yaml

@@ -101,7 +101,6 @@ configmap:
     common.prf: |
       # Directives for unison
       ignore = Name .Xauthority
-      ignore = Name atlassian-jira-security.log
       ignore = Name DVRWorkDirectory
       ignore = Name ldapi
       ignore = Name lost+found
@@ -110,27 +109,21 @@ configmap:
       ignore = Name *KubernetesClients.log
       ignore = Name *socket
       ignore = Name .s.PGSQL.5432
+      ignore = Name atlassian-*.log
       ignore = Name pgstat.stat
       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/rainloop/data/_data_/_default_/cache
       ignore = Path data-sync/dos
-      ignore = Path data-sync/duplicati/config
-      ignore = Path data-sync/gitlab/data/postgresql/data/pg_stat_tmp
-      ignore = Path data-sync/gitlab/data/prometheus/data
-      ignore = Path data-sync/gitlab/data/redis/dump.rdb
       ignore = Path data-sync/gitlab/data/gitaly
-      ignore = Path data-sync/gitlab/logs/sshd/current
+      ignore = Path data-sync/home/*/.kube/cache
       ignore = Path data-sync/jira/home/analytics-logs
-      ignore = Path data-sync/jira/home/log/atlassian-jira.log
-      ignore = Path data-sync/jira/home/log/atlassian-jira-ipd-monitoring.log
-      ignore = Path data-sync/jira/home/log/atlassian-jira-outgoing-mail.log
-      ignore = Path data-sync/jira/home/log/atlassian-jira-perf.log
       ignore = Path data-sync/jira/home/log/automation-jira-performance.csv
       ignore = Path data-sync/jira/home/monitor/ConnectionPoolGraph.rrd4j
       ignore = Path data-sync/jira/home/monitor/DatabaseReadWritesGraph.rrd4j
-      ignore = Path data-sync/jira/home/plugins/.osgi-plugins/felix/felix-cache
-      ignore = Path data-sync/jira/logs
+      ignore = Path data-sync/jira/home/log/jfr
+      ignore = Path data-sync/jira/logs/access_*
       ignore = Path data-sync/nexus/db/accesslog
       ignore = Path redis/current
       ignore = Path data-sync/samba-dc/var/lib/winbindd_privileged/pipe

images/ddclient/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.19
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF
@@ -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 DDCLIENT_VERSION=3.9.1-r2
+ARG DDCLIENT_VERSION=3.11.2-r0
 ENV HOST= \
     INTERVAL=3600 \
     IPLOOKUP_URI=http://ipinfo.io/ip \
@@ -17,9 +17,7 @@ ENV HOST= \
     USER_LOGIN= \
     USER_SECRET=ddclient-user
 
-RUN echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' \
-      >>/etc/apk/repositories && \
-    apk add --no-cache --update curl ddclient@testing=$DDCLIENT_VERSION \
+RUN apk add --no-cache --update curl ddclient=$DDCLIENT_VERSION \
       su-exec && \
     chown ddclient /var/cache/ddclient
 

images/ddclient/helm/Chart.yaml

@@ -6,8 +6,8 @@ sources:
 - https://github.com/instantlinux/docker-tools
 - https://github.com/ddclient/ddclient/
 type: application
-version: 0.1.2
-appVersion: "3.9.1-r2"
+version: 0.1.3
+appVersion: "3.11.2-r0"
 dependencies:
 - name: chartlib
   version: 0.1.8

images/dhcpd-dns-pxe/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF
@@ -8,8 +8,8 @@ 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 DHCP_VERSION=4.4.3_p1-r2
-ARG DNSMASQ_VERSION=2.89-r5
+ARG DHCP_VERSION=4.4.3_p1-r4
+ARG DNSMASQ_VERSION=2.89-r6
 
 ENV DHCP_BOOT=pxelinux.0 \
     DHCP_ENABLE=yes \

images/dhcpd-dns-pxe/helm/Chart.yaml

@@ -7,8 +7,8 @@ sources:
 - https://source.isc.org/git/dhcp.git
 - http://thekelleys.org.uk/gitweb/?p=dnsmasq.git
 type: application
-version: 0.1.9
-appVersion: "4.4.3_p1-r2-2.89-r5"
+version: 0.1.10
+appVersion: "4.4.3_p1-r4-2.89-r6"
 dependencies:
 - name: chartlib
   version: 0.1.8

images/ez-ipupdate/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF

images/haproxy-keepalived/Dockerfile

@@ -1,4 +1,4 @@
-FROM haproxy:2.8.3-alpine
+FROM haproxy:2.9.1-alpine
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF

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.13
-appVersion: "2.8.3-alpine-2.2.8-r0"
+version: 0.1.14
+appVersion: "2.9.1-alpine-2.2.8-r0"
 dependencies:
 - name: chartlib
   version: 0.1.8

images/mysqldump/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF
@@ -19,7 +19,7 @@ ENV HOUR=3 MINUTE=30 \
 
 ARG UID=210
 ARG BACKUP_GID=34
-ARG CLIENT_VERSION=10.11.4-r0
+ARG CLIENT_VERSION=10.11.5-r3
 
 RUN RMGROUP=$(grep :$BACKUP_GID: /etc/group | cut -d: -f 1) && \
     [ -z "$RMGROUP" ] || delgroup $RMGROUP && \

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.7
-appVersion: "10.11.4-r0"
+version: 0.1.8git 
+appVersion: "10.11.5-r3"
 dependencies:
 - name: chartlib
   version: 0.1.8

images/mythtv-backend/Dockerfile

@@ -22,10 +22,10 @@ ARG APT_KEY=13551B881504888C
 ARG MYTHTV_GID=100
 ARG MYTHTV_UID=2021
 ARG MYTHTV_PPA=http://ppa.launchpad.net/mythbuntu/33
-ARG MYTHTV_VERSION=2:33.1+fixes.202309262218.26e76a3949~ubuntu22.04.1
+ARG MYTHTV_VERSION=2:33.1+fixes.202311120433.4112015bfe~ubuntu22.04.1
 ARG SSH_PORT=2022
 ARG MYTHWEB_PORT=6760
-ARG PPA_BRANCH=32
+ARG PPA_BRANCH=33
 ARG MYTHLINK_SHA=459cb8b60adae4b631a95a9cfb1b41dcb959cc4a0b9053582a711d58b8d8a0d2
 
 RUN \

images/mythtv-backend/helm/Chart.yaml

@@ -7,7 +7,7 @@ sources:
 - https://github.com/mythtv/mythtv
 type: application
 version: 0.1.9
-appVersion: "33.1+fixes.202309262218.26e76a3949"
+appVersion: "33.1-fixes.202309262218.26e76a3949"
 dependencies:
 - name: chartlib
   version: 0.1.8

images/nagios/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF
@@ -8,10 +8,10 @@ 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 NAGIOS_VERSION=4.4.13-r0
+ARG NAGIOS_VERSION=4.4.13-r1
 ARG NAGIOS_GID=1000
 ARG NAGIOS_UID=999
-ARG PLUGINS_VERSION=2.4.5-r2
+ARG PLUGINS_VERSION=2.4.5-r1
 ARG WWW_UID=33
 ENV AUTHORIZED_USERS=nagiosadmin \
     CONFIG_CHECK=yes \
@@ -29,14 +29,12 @@ RUN deluser xfs && addgroup -g $NAGIOS_GID nagios && \
     adduser -g www-data -u $WWW_UID -DSH -h /var/www www-data && \
     adduser -G nagios -g "Nagios Server" -DSH -h /var/nagios -u $NAGIOS_UID \
       nagios && \
-    echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' \
-      >>/etc/apk/repositories && \
     apk add --update --no-cache nagios=$NAGIOS_VERSION nagios-web \
       nagios-plugins-all=$PLUGINS_VERSION \
       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 \
-      php8@testing php8-fpm@testing py3-pip python3 ssmtp tzdata && \
+      php81 php81-fpm py3-pip python3 ssmtp tzdata && \
     pip3 install pymysql==1.0.2 && \
     addgroup nginx nagios && \
     chmod u+s /usr/lib/nagios/plugins/check_ping && \

images/nagiosql/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.15
+FROM alpine:3.19
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF
@@ -21,23 +21,23 @@ ENV APACHE_BIN=httpd \
 ARG APACHE_UID=33
 ARG NAGIOS_GID=1000
 ARG NAGIOS_UID=999
-ARG NAGIOS_VERSION=4.4.6-r3
-ARG NAGIOSQL_VERSION=3.4.1
-ARG NAGIOSQL_SHA=a2b280b1178f7d26a66068c41faba5a38f8575d5cafe32836d7a2594d7e217ad
-ARG NAGIOSQL_DOWNLOAD=nagiosql-$NAGIOSQL_VERSION-git2020-01-19.tar.bz2
+ARG NAGIOS_VERSION=4.4.13-r1
+ARG NAGIOSQL_VERSION=3.5.0
+ARG NAGIOSQL_SHA=f777dfd8152768669ac73d96a6547fc5d8add80f50fb9fb4e255fc4f344d1222
+ARG NAGIOSQL_DOWNLOAD=nagiosql-$NAGIOSQL_VERSION-git2023-06-18.tar.bz2
 
 COPY src /tmp/
 COPY html /var/www/html
 RUN deluser xfs && 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 php7 \
-      php7-apache2 php7-ftp php7-gettext php7-mysqli php7-pear php7-session \
-      php7-ssh2 tzdata && \
+    apk add --update --no-cache apache2 curl nagios=$NAGIOS_VERSION php81 \
+      php81-apache2 php81-ftp php81-gettext php81-mysqli php81-pear php81-session \
+      php81-pecl-ssh2 tzdata && \
     addgroup apache nagios && \
-    echo 'date.timezone = UTC' > /etc/php7/conf.d/50-tz.ini && \
+    echo 'date.timezone = UTC' > /etc/php81/conf.d/50-tz.ini && \
     echo 'include_path = ".:/var/www/nagiosql/libraries/pear"' \
-      > /etc/php7/conf.d/50-include.ini && \
+      > /etc/php81/conf.d/50-include.ini && \
     cd /tmp && \
     curl -sLo $NAGIOSQL_DOWNLOAD \
       https://sourceforge.net/projects/nagiosql/files/nagiosql/NagiosQL%20${NAGIOSQL_VERSION}/${NAGIOSQL_DOWNLOAD} && \

images/openldap/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF
@@ -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 OPENLDAP_VERSION=2.6.5-r0
+ARG OPENLDAP_VERSION=2.6.6-r1
 ENV SLAPD_DN_ATTR=uid \
     SLAPD_FQDN=example.com \
     SLAPD_LOG_LEVEL=Config,Stats \

images/openldap/helm/Chart.yaml

@@ -6,8 +6,8 @@ sources:
 - https://github.com/instantlinux/docker-tools
 - https://git.openldap.org/openldap/openldap
 type: application
-version: 0.1.4
-appVersion: "2.6.5-r0"
+version: 0.1.5
+appVersion: "2.6.6-r0"
 dependencies:
 - name: chartlib
   version: 0.1.8

images/postfix-python/Dockerfile

@@ -1,4 +1,4 @@
-ARG POSTFIX_VERSION=3.8.2-r0
+ARG POSTFIX_VERSION=3.8.3-r1
 
 FROM instantlinux/postfix:$POSTFIX_VERSION
 MAINTAINER Rich Braun "[email protected]"

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.10
-appVersion: "3.8.2-r0"
+version: 0.1.11
+appVersion: "3.8.3-r1"
 dependencies:
 - name: chartlib
   version: 0.1.8

images/postfix/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF
@@ -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.2-r0
+ARG POSTFIX_VERSION=3.8.3-r1
 ENV SASL_PASSWD_SECRET=postfix-sasl-passwd \
     TZ=UTC
 

images/proftpd/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF
@@ -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-r0
+ARG PROFTPD_VERSION=1.3.8a-r1
 ENV ALLOW_OVERWRITE=on \
     ANONYMOUS_DISABLE=off \
     ANON_UPLOAD_ENABLE=DenyAll \

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.6
-appVersion: "1.3.8a-r0"
+version: 0.1.7
+appVersion: "1.3.8a-r1"
 dependencies:
 - name: chartlib
   version: 0.1.8

images/rsyslogd/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18
+FROM alpine:3.19
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF
@@ -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 RSYSLOG_VERSION=8.2306.0-r2
+ARG RSYSLOG_VERSION=8.2310.0-r0
 ENV TZ=UTC
 RUN apk add --update gzip logrotate rsyslog=$RSYSLOG_VERSION \
       rsyslog-mysql=$RSYSLOG_VERSION tar xz && \

images/rsyslogd/helm/Chart.yaml

@@ -6,8 +6,8 @@ sources:
 - https://github.com/instantlinux/docker-tools
 - https://github.com/rsyslog/rsyslog
 type: application
-version: 0.1.9
-appVersion: "8.2306.0-r2"
+version: 0.1.10
+appVersion: "8.2310.0-r0"
 dependencies:
 - name: chartlib
   version: 0.1.8