SYS-622 updates for authelia, ddclient, dhcp-dns-pxe, ez-ipupdate, my…

…thtv-backend
instantlinux · Jul 2, 2024 · cdc50e7 · cdc50e7
1 parent c5789d4
commit cdc50e7
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 23 deletions.
diff --git a/images/ddclient/Dockerfile b/images/ddclient/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM alpine:3.20
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF

diff --git a/images/dhcpd-dns-pxe/Dockerfile b/images/dhcpd-dns-pxe/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM alpine:3.20
 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 DHCP_VERSION=4.4.3_p1-r4
-ARG DNSMASQ_VERSION=2.90-r2
+ARG DNSMASQ_VERSION=2.90-r3
 
 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
@@ -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.10
-appVersion: "4.4.3_p1-r4-2.90-r2"
+version: 0.1.11
+appVersion: "4.4.3_p1-r4-2.90-r3"
 dependencies:
 - name: chartlib
   version: 0.1.8

diff --git a/images/ez-ipupdate/Dockerfile b/images/ez-ipupdate/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19
+FROM alpine:3.20
 MAINTAINER Rich Braun "[email protected]"
 ARG BUILD_DATE
 ARG VCS_REF

diff --git a/images/mythtv-backend/Dockerfile b/images/mythtv-backend/Dockerfile
@@ -22,7 +22,7 @@ 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.202311120433.4112015bfe~ubuntu22.04.1
+ARG MYTHTV_VERSION=2:33.1+fixes.202405301110.512d723c83~ubuntu22.04.1
 ARG SSH_PORT=2022
 ARG MYTHWEB_PORT=6760
 ARG PPA_BRANCH=33

diff --git a/k8s/helm/authelia/templates/configmap.yaml b/k8s/helm/authelia/templates/configmap.yaml
@@ -6,24 +6,28 @@ metadata:
     {{- include "local.labels" . | nindent 4 }}
 data:
   configuration.yml: |
-    server:
-      port: 80
+    # TODO - resolve env var conflict introduced in 4.30; requires
+    #  enableServiceLinks=false in pod spec
+    # server:
+    #   address: tcp://:80
+
     # set to trace for troubleshooting
     log:
       level: {{ .Values.logLevel }}
 
     authentication_backend:
       ldap:
-        url: ldap://ldap
+        address: ldap://ldap
         base_dn: {{ .Values.baseDN }}
         users_filter: (&({username_attribute}={input})(objectClass=inetOrgPerson))
-        username_attribute: uid
         additional_users_dn: ou=users
         additional_groups_dn: ou=groups
-        display_name_attribute: sn
+        attributes:
+          display_name: sn
+          group_name: cn
+          mail: mail
+          username: uid
         groups_filter: (&(member={dn})(objectclass=groupOfNames))
-        group_name_attribute: cn
-        mail_attribute: mail
         user: cn=admin,{{ .Values.baseDN }}
 
     # Access Control
@@ -49,6 +53,7 @@ data:
     session:
       expiration: {{ .Values.session.expiration }}
       inactivity: {{ .Values.session.inactivity }}
+      # TODO this is deprecated with little info about how to fix it
       domain: {{ .Values.session.domain }}
       redis:
         host: redis
@@ -63,15 +68,13 @@ data:
     # The directory where the DB files will be saved
     storage:
       mysql:
-        host: {{ .Values.mysql.host }}
-        port: {{ .Values.mysql.port }}
+        address: {{ .Values.mysql.address }}
         database: {{ .Values.mysql.database }}
         username: {{ .Values.mysql.username }}
 
     # Configuration of the notification system.
     notifier:
       smtp:
+        address: {{ .Values.smtp.address }}
         username: {{ .Values.smtp.username }}
-        host: {{ .Values.smtp.host }}
-        port: {{ .Values.smtp.port }}
         sender: {{ .Values.smtp.sender }}
diff --git a/k8s/helm/authelia/values.yaml b/k8s/helm/authelia/values.yaml
@@ -5,25 +5,23 @@ bypassUser: "user:username"
 domains: [ example.com ]
 logLevel: info
 mysql:
-  host: db00
-  port: 3306
+  address: tcp://db00:3306
   database: authelia
   username: authelia
 session:
   domain: example.com
   expiration: 2w
   inactivity: 5m
 smtp:
-  host: smtp.gmail.com
-  port: 587
+  address: submission://smtp.gmail.com:587
   sender: [email protected]
   username: [email protected]
 tlsHostname: authelia.example.com
 
 deployment:
   containerPorts: [ containerPort: 80 ]
   env:
-    authelia_jwt_secret_file: /config/secrets/jwt_secret
+    authelia_identity_validation_reset_password_jwt_secret_file: /config/secrets/jwt_secret
     authelia_session_secret_file: /config/secrets/session_secret
     authelia_session_redis_password_file: /config/secrets/redis_password
     authelia_storage_mysql_password_file: /config/secrets/mysql_password