From 97cf4258b3984a5448fdf4739f9c851b17dc2dbf Mon Sep 17 00:00:00 2001 From: Rich Braun Date: Mon, 18 Dec 2023 22:30:20 -0800 Subject: [PATCH] SYS-619 upgrade images to alpine 3.19 --- images/data-sync/Dockerfile | 4 ++-- images/data-sync/helm/Chart.yaml | 4 ++-- images/data-sync/helm/values.yaml | 17 +++++----------- images/ddclient/Dockerfile | 8 +++----- images/ddclient/helm/Chart.yaml | 4 ++-- images/dhcpd-dns-pxe/Dockerfile | 6 +++--- images/dhcpd-dns-pxe/helm/Chart.yaml | 4 ++-- images/ez-ipupdate/Dockerfile | 2 +- images/haproxy-keepalived/Dockerfile | 2 +- images/haproxy-keepalived/helm/Chart.yaml | 4 ++-- images/mysqldump/Dockerfile | 4 ++-- images/mysqldump/helm/Chart.yaml | 4 ++-- images/mythtv-backend/Dockerfile | 4 ++-- images/mythtv-backend/helm/Chart.yaml | 2 +- images/nagios/Dockerfile | 10 ++++------ images/nagiosql/Dockerfile | 20 +++++++++---------- images/openldap/Dockerfile | 4 ++-- images/openldap/helm/Chart.yaml | 4 ++-- images/postfix-python/Dockerfile | 2 +- images/postfix-python/helm/Chart.yaml | 4 ++-- images/postfix/Dockerfile | 4 ++-- images/proftpd/Dockerfile | 4 ++-- images/proftpd/helm/Chart.yaml | 4 ++-- images/rsyslogd/Dockerfile | 4 ++-- images/rsyslogd/helm/Chart.yaml | 4 ++-- images/samba-dc/Dockerfile | 4 ++-- images/samba-dc/helm/Chart.yaml | 4 ++-- images/samba/Dockerfile | 4 ++-- images/samba/helm/Chart.yaml | 4 ++-- images/udp-nginx-proxy/Dockerfile | 2 +- images/vsftpd/Dockerfile | 2 +- images/weewx/Dockerfile | 2 +- k8s/helm/gitlab/Chart.yaml | 4 ++-- k8s/helm/guacamole/Chart.yaml | 8 ++++---- .../subcharts/guacamole-server/Chart.yaml | 4 ++-- k8s/helm/guacamole/subcharts/guacd/Chart.yaml | 4 ++-- k8s/helm/jira/Chart.yaml | 4 ++-- k8s/helm/nexus/Chart.yaml | 4 ++-- k8s/helm/restic/Chart.yaml | 4 ++-- k8s/helm/restic/values.yaml | 6 ++++-- k8s/helm/splunk/Chart.yaml | 4 ++-- stacks/services/Makefile | 7 ++++++- 42 files changed, 100 insertions(+), 104 deletions(-) diff --git a/images/data-sync/Dockerfile b/images/data-sync/Dockerfile index 852b453e..43dc49c9 100644 --- a/images/data-sync/Dockerfile +++ b/images/data-sync/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 @@ -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 diff --git a/images/data-sync/helm/Chart.yaml b/images/data-sync/helm/Chart.yaml index 3c3220e6..395377f1 100644 --- a/images/data-sync/helm/Chart.yaml +++ b/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 diff --git a/images/data-sync/helm/values.yaml b/images/data-sync/helm/values.yaml index c5b10ed9..e06407a0 100644 --- a/images/data-sync/helm/values.yaml +++ b/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 diff --git a/images/ddclient/Dockerfile b/images/ddclient/Dockerfile index a790f1a4..aefd0808 100644 --- a/images/ddclient/Dockerfile +++ b/images/ddclient/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.16 +FROM alpine:3.19 MAINTAINER Rich Braun "docker@instantlinux.net" 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 diff --git a/images/ddclient/helm/Chart.yaml b/images/ddclient/helm/Chart.yaml index d48e1d58..e2667fe5 100644 --- a/images/ddclient/helm/Chart.yaml +++ b/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 diff --git a/images/dhcpd-dns-pxe/Dockerfile b/images/dhcpd-dns-pxe/Dockerfile index 79f24aaf..c8fd8d97 100644 --- a/images/dhcpd-dns-pxe/Dockerfile +++ b/images/dhcpd-dns-pxe/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 @@ -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 \ diff --git a/images/dhcpd-dns-pxe/helm/Chart.yaml b/images/dhcpd-dns-pxe/helm/Chart.yaml index 9738a8d4..6d6bb25d 100644 --- a/images/dhcpd-dns-pxe/helm/Chart.yaml +++ b/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 diff --git a/images/ez-ipupdate/Dockerfile b/images/ez-ipupdate/Dockerfile index bc7e093f..da07d006 100644 --- a/images/ez-ipupdate/Dockerfile +++ b/images/ez-ipupdate/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 diff --git a/images/haproxy-keepalived/Dockerfile b/images/haproxy-keepalived/Dockerfile index 0106c898..afd5c64a 100644 --- a/images/haproxy-keepalived/Dockerfile +++ b/images/haproxy-keepalived/Dockerfile @@ -1,4 +1,4 @@ -FROM haproxy:2.8.3-alpine +FROM haproxy:2.9.1-alpine MAINTAINER Rich Braun "docker@instantlinux.net" ARG BUILD_DATE ARG VCS_REF diff --git a/images/haproxy-keepalived/helm/Chart.yaml b/images/haproxy-keepalived/helm/Chart.yaml index 179e3b9a..4bc20f0f 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.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 diff --git a/images/mysqldump/Dockerfile b/images/mysqldump/Dockerfile index eb257e5e..e1d3ccea 100644 --- a/images/mysqldump/Dockerfile +++ b/images/mysqldump/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 @@ -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 && \ diff --git a/images/mysqldump/helm/Chart.yaml b/images/mysqldump/helm/Chart.yaml index b7784ad6..f1419b86 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.7 -appVersion: "10.11.4-r0" +version: 0.1.8git +appVersion: "10.11.5-r3" dependencies: - name: chartlib version: 0.1.8 diff --git a/images/mythtv-backend/Dockerfile b/images/mythtv-backend/Dockerfile index 06a89c86..06d6b46d 100644 --- a/images/mythtv-backend/Dockerfile +++ b/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 \ diff --git a/images/mythtv-backend/helm/Chart.yaml b/images/mythtv-backend/helm/Chart.yaml index 3aac977a..0fd78d9c 100644 --- a/images/mythtv-backend/helm/Chart.yaml +++ b/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 diff --git a/images/nagios/Dockerfile b/images/nagios/Dockerfile index a5c9faab..a1716349 100644 --- a/images/nagios/Dockerfile +++ b/images/nagios/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 @@ -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 && \ diff --git a/images/nagiosql/Dockerfile b/images/nagiosql/Dockerfile index 423d2e57..32a4dae6 100644 --- a/images/nagiosql/Dockerfile +++ b/images/nagiosql/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:3.19 MAINTAINER Rich Braun "docker@instantlinux.net" 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} && \ diff --git a/images/openldap/Dockerfile b/images/openldap/Dockerfile index addd99fe..2f1a90f5 100644 --- a/images/openldap/Dockerfile +++ b/images/openldap/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 @@ -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 \ diff --git a/images/openldap/helm/Chart.yaml b/images/openldap/helm/Chart.yaml index d2bccd80..bebb2703 100644 --- a/images/openldap/helm/Chart.yaml +++ b/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 diff --git a/images/postfix-python/Dockerfile b/images/postfix-python/Dockerfile index e14e3a6f..ba858b06 100644 --- a/images/postfix-python/Dockerfile +++ b/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 "docker@instantlinux.net" diff --git a/images/postfix-python/helm/Chart.yaml b/images/postfix-python/helm/Chart.yaml index 9449eed0..0857f768 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.10 -appVersion: "3.8.2-r0" +version: 0.1.11 +appVersion: "3.8.3-r1" dependencies: - name: chartlib version: 0.1.8 diff --git a/images/postfix/Dockerfile b/images/postfix/Dockerfile index 9c558403..f1482e61 100644 --- a/images/postfix/Dockerfile +++ b/images/postfix/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 @@ -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 diff --git a/images/proftpd/Dockerfile b/images/proftpd/Dockerfile index e433da25..2cbc2bd3 100644 --- a/images/proftpd/Dockerfile +++ b/images/proftpd/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 @@ -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 \ diff --git a/images/proftpd/helm/Chart.yaml b/images/proftpd/helm/Chart.yaml index 9476bf1a..940ebcf4 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.6 -appVersion: "1.3.8a-r0" +version: 0.1.7 +appVersion: "1.3.8a-r1" dependencies: - name: chartlib version: 0.1.8 diff --git a/images/rsyslogd/Dockerfile b/images/rsyslogd/Dockerfile index 31144ccd..8c687114 100644 --- a/images/rsyslogd/Dockerfile +++ b/images/rsyslogd/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 @@ -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 && \ diff --git a/images/rsyslogd/helm/Chart.yaml b/images/rsyslogd/helm/Chart.yaml index cc9ba480..fbeb69ce 100644 --- a/images/rsyslogd/helm/Chart.yaml +++ b/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 diff --git a/images/samba-dc/Dockerfile b/images/samba-dc/Dockerfile index a8223552..917ffd05 100644 --- a/images/samba-dc/Dockerfile +++ b/images/samba-dc/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 @@ -24,7 +24,7 @@ ENV ADMIN_PASSWORD_SECRET=samba-admin-password \ WINBIND_USE_DEFAULT_DOMAIN=yes \ WORKGROUP=AD -ARG SAMBA_VERSION=4.18.8-r0 +ARG SAMBA_VERSION=4.18.9-r0 COPY *.conf.j2 /root/ COPY entrypoint.sh /usr/local/bin/ diff --git a/images/samba-dc/helm/Chart.yaml b/images/samba-dc/helm/Chart.yaml index a8a50644..e6beaebc 100644 --- a/images/samba-dc/helm/Chart.yaml +++ b/images/samba-dc/helm/Chart.yaml @@ -6,8 +6,8 @@ sources: - https://github.com/instantlinux/docker-tools - ttps://gitlab.com/samba-team/samba type: application -version: 0.1.11 -appVersion: "4.18.8-r0" +version: 0.1.12 +appVersion: "4.18.9-r0" dependencies: - name: chartlib version: 0.1.8 diff --git a/images/samba/Dockerfile b/images/samba/Dockerfile index f6fa5a48..a7d65ecf 100644 --- a/images/samba/Dockerfile +++ b/images/samba/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 @@ -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 SAMBA_VERSION=4.18.8-r0 +ARG SAMBA_VERSION=4.18.9-r0 ENV LOGON_DRIVE=H \ NETBIOS_NAME=samba \ SERVER_STRING="Samba Server" \ diff --git a/images/samba/helm/Chart.yaml b/images/samba/helm/Chart.yaml index 948e3952..428e2ec3 100644 --- a/images/samba/helm/Chart.yaml +++ b/images/samba/helm/Chart.yaml @@ -6,8 +6,8 @@ sources: - https://github.com/instantlinux/docker-tools - https://gitlab.com/samba-team/samba type: application -version: 0.1.11 -appVersion: "4.18.8-r0" +version: 0.1.12 +appVersion: "4.18.9-r0" dependencies: - name: chartlib version: 0.1.8 diff --git a/images/udp-nginx-proxy/Dockerfile b/images/udp-nginx-proxy/Dockerfile index 61b04b0b..1f04e560 100644 --- a/images/udp-nginx-proxy/Dockerfile +++ b/images/udp-nginx-proxy/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.25.2-alpine +FROM nginx:1.25.3-alpine MAINTAINER Rich Braun "docker@instantlinux.net" ARG BUILD_DATE ARG VCS_REF diff --git a/images/vsftpd/Dockerfile b/images/vsftpd/Dockerfile index fa71ff12..81866a4e 100644 --- a/images/vsftpd/Dockerfile +++ b/images/vsftpd/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 diff --git a/images/weewx/Dockerfile b/images/weewx/Dockerfile index 68c2a097..f0089337 100644 --- a/images/weewx/Dockerfile +++ b/images/weewx/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.17 +FROM alpine:3.19 MAINTAINER Rich Braun "docker@instantlinux.net" ARG BUILD_DATE ARG VCS_REF diff --git a/k8s/helm/gitlab/Chart.yaml b/k8s/helm/gitlab/Chart.yaml index 42992c8b..92bf236c 100644 --- a/k8s/helm/gitlab/Chart.yaml +++ b/k8s/helm/gitlab/Chart.yaml @@ -7,8 +7,8 @@ sources: - https://github.com/instantlinux/docker-tools - https://gitlab.com/gitlab-org/gitlab type: application -version: 0.1.7 -appVersion: "16.3.3-ce.0" +version: 0.1.8 +appVersion: "16.5.0-ce.0" dependencies: - name: chartlib version: 0.1.8 diff --git a/k8s/helm/guacamole/Chart.yaml b/k8s/helm/guacamole/Chart.yaml index 3f04e3bc..59f5ab5c 100644 --- a/k8s/helm/guacamole/Chart.yaml +++ b/k8s/helm/guacamole/Chart.yaml @@ -7,15 +7,15 @@ sources: - https://github.com/apache/guacamole-client - https://github.com/apache/guacamole-server type: application -version: 0.1.2 -appVersion: "1.4.0" +version: 0.1.3 +appVersion: "1.5.3" dependencies: - name: chartlib version: 0.1.8 repository: https://instantlinux.github.io/docker-tools - name: guacamole-server - version: 0.1.1 + version: 0.1.2 repository: file://subcharts/guacamole-server - name: guacd - version: 0.1.1 + version: 0.1.2 repository: file://subcharts/guacd diff --git a/k8s/helm/guacamole/subcharts/guacamole-server/Chart.yaml b/k8s/helm/guacamole/subcharts/guacamole-server/Chart.yaml index 1996f5ba..fec9c4c5 100644 --- a/k8s/helm/guacamole/subcharts/guacamole-server/Chart.yaml +++ b/k8s/helm/guacamole/subcharts/guacamole-server/Chart.yaml @@ -6,8 +6,8 @@ sources: - https://github.com/instantlinux/docker-tools - https://github.com/apache/guacamole-server type: application -version: 0.1.1 -appVersion: "1.4.0" +version: 0.1.2 +appVersion: "1.5.3" dependencies: - name: chartlib version: 0.1.5 diff --git a/k8s/helm/guacamole/subcharts/guacd/Chart.yaml b/k8s/helm/guacamole/subcharts/guacd/Chart.yaml index 2331a8b5..bd80b801 100644 --- a/k8s/helm/guacamole/subcharts/guacd/Chart.yaml +++ b/k8s/helm/guacamole/subcharts/guacd/Chart.yaml @@ -6,8 +6,8 @@ sources: - https://github.com/instantlinux/docker-tools - https://github.com/apache/guacamole-client type: application -version: 0.1.1 -appVersion: "1.4.0" +version: 0.1.2 +appVersion: "1.5.3" dependencies: - name: chartlib version: 0.1.5 diff --git a/k8s/helm/jira/Chart.yaml b/k8s/helm/jira/Chart.yaml index 2d16f742..03d754a8 100644 --- a/k8s/helm/jira/Chart.yaml +++ b/k8s/helm/jira/Chart.yaml @@ -6,8 +6,8 @@ sources: - https://github.com/instantlinux/docker-tools - https://hub.docker.com/r/atlassian/jira-core type: application -version: 0.1.2 -appVersion: "9.7.2" +version: 0.1.5 +appVersion: "9.12.1" dependencies: - name: chartlib version: 0.1.8 diff --git a/k8s/helm/nexus/Chart.yaml b/k8s/helm/nexus/Chart.yaml index 4cfaa0a9..3cece312 100644 --- a/k8s/helm/nexus/Chart.yaml +++ b/k8s/helm/nexus/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.7 -appVersion: "3.56.0" +version: 0.1.9 +appVersion: "3.63.0" dependencies: - name: chartlib version: 0.1.8 diff --git a/k8s/helm/restic/Chart.yaml b/k8s/helm/restic/Chart.yaml index baefa6de..58054ce2 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.6 +version: 0.1.7 # Remember to update restic== in values.yaml as releases are published; # the values.yaml file is not able to reference .Chart.appVersion -appVersion: "0.15.2-r4" +appVersion: "0.16.2-r0" dependencies: - name: chartlib version: 0.1.8 diff --git a/k8s/helm/restic/values.yaml b/k8s/helm/restic/values.yaml index 8f22ca28..2605ea3e 100644 --- a/k8s/helm/restic/values.yaml +++ b/k8s/helm/restic/values.yaml @@ -7,7 +7,7 @@ deployment: args: - -c - > - apk add --update restic==0.15.2-r4 tzdata && + apk add --update restic==$APP_VERSION tzdata && ln -s /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && echo "if [ -r $HOME/.resticrc ]; then . $HOME/.resticrc; fi" \ @@ -15,6 +15,8 @@ deployment: touch /var/log/restic.log && /usr/sbin/crond && 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 env: /etc/profile tz: UTC nodeSelector: @@ -92,7 +94,7 @@ volumes: image: repository: alpine pullPolicy: IfNotPresent - tag: 3.18 + tag: 3.19 nameOverride: "" fullnameOverride: "" diff --git a/k8s/helm/splunk/Chart.yaml b/k8s/helm/splunk/Chart.yaml index 36a642d2..ff2904b0 100644 --- a/k8s/helm/splunk/Chart.yaml +++ b/k8s/helm/splunk/Chart.yaml @@ -15,8 +15,8 @@ sources: - https://github.com/instantlinux/docker-tools - https://hub.docker.com/r/splunk/splunk type: application -version: 0.1.7 -appVersion: "9.0.5" +version: 0.1.8 +appVersion: "9.1.1" dependencies: - name: chartlib version: 0.1.8 diff --git a/stacks/services/Makefile b/stacks/services/Makefile index 7aafaf7c..429baab5 100644 --- a/stacks/services/Makefile +++ b/stacks/services/Makefile @@ -7,7 +7,7 @@ HOST = $(shell hostname -s) REGISTRY_URI ?= nexus.instantlinux.net -SERVICES = haproxy-keepalived keycloak mythtv-backend nut-upsd restic-server +SERVICES = haproxy-keepalived mythtv-backend nut-upsd restic-server ifeq ($(shell test -d /var/adm/admin/services && echo 1),1) export ADMIN_PATH=/var/adm/admin/services endif @@ -21,6 +21,11 @@ $(SERVICES):: @echo Starting $@ cd $@ ; docker-compose up -d +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; \