SYS-610 upgrade mythtv to version 33 (#116)

README.md

@@ -17,7 +17,7 @@ easy. Contents:
 | ssl | PKI certificate tools (deprecated by k8s) |
 | stacks | container resources in docker-compose format |
 
-Find images at [docker hub/instantlinux](https://hub.docker.com/r/instantlinux/). Each image is scanned for published CVE vulnerabilities by (trivy)[https://trivy.dev/] before promotion to Docker Hub.
+Find images at [docker hub/instantlinux](https://hub.docker.com/r/instantlinux/). Each image is scanned by [trivy](https://trivy.dev/) to ensure they contain no known CVE vulnerabilities before promotion to Docker Hub.
 
 Find a lot more details about the Kubernetes bare-metal installer in [k8s/README](k8s/README.md).
 

ansible/roles/mythfrontend/defaults/main.yml

@@ -227,7 +227,7 @@ ir_device:
 mythdb_overrides: {}
 db: "{{ db_defaults | combine(mythdb_overrides) }}"
 
-mythtv_version: 32
+mythtv_version: 33
 
 opensuse_packages:
   - ImageMagick-devel

images/mythtv-backend/Dockerfile

@@ -21,15 +21,15 @@ ENV APACHE_LOG_DIR=/var/log/apache2 \
 ARG APT_KEY=13551B881504888C
 ARG MYTHTV_GID=100
 ARG MYTHTV_UID=2021
-ARG MYTHTV_PPA=http://ppa.launchpad.net/mythbuntu/32
-ARG MYTHTV_VERSION=2:32.0+fixes.202305160103.72024244b8~ubuntu22.04.1
+ARG MYTHTV_PPA=http://ppa.launchpad.net/mythbuntu/33
+ARG MYTHTV_VERSION=2:33.1+fixes.202307251604.402c6d7758~ubuntu22.04.1
 ARG SSH_PORT=2022
 ARG MYTHWEB_PORT=6760
 ARG PPA_BRANCH=32
 ARG MYTHLINK_SHA=459cb8b60adae4b631a95a9cfb1b41dcb959cc4a0b9053582a711d58b8d8a0d2
 
 RUN \
-  apt-get -yq update && apt-get -y upgrade && \
+  apt-get -yq update && \
   apt-get install -yq gnupg locales wget && \
   apt-key adv --recv-keys --keyserver keyserver.ubuntu.com $APT_KEY && \
   echo "deb $MYTHTV_PPA/ubuntu jammy main" \
@@ -41,7 +41,8 @@ RUN \
     openssh-client openssh-server mythtv-backend=$MYTHTV_VERSION \
     mythtv-common=$MYTHTV_VERSION mythtv-transcode-utils=$MYTHTV_VERSION \
     mythweb=$MYTHTV_VERSION libmyth-python libmythtv-perl php-mythtv psmisc \
-    sudo tzdata v4l-utils vim w3m x11-utils xauth xmltv xterm
+    sudo tzdata v4l-utils vim w3m x11-utils xauth xmltv xterm && \
+  rm /etc/ssh/ssh_host_*
 
 COPY src/ /root/
 
@@ -61,5 +62,5 @@ RUN \
 
 EXPOSE $MYTHWEB_PORT $SSH_PORT 5000/udp 5002/udp 5004/udp 6543 6544 6549 \
   65001 65001/udp 
-VOLUME $APACHE_LOG_DIR
+VOLUME $APACHE_LOG_DIR /etc/ssh
 ENTRYPOINT ["/root/entrypoint.sh"]

images/mythtv-backend/README.md

@@ -77,6 +77,15 @@ This ansible script is prone to configuration glitches so you will likely have t
 
 Note that the [Kodi](https://kodi.tv/download/) frontend also provides limited support for the MythTV backend.
 
+### Volumes
+
+Optionally, mount these path names to persistent storage:
+
+Path | Description
+---- | -----------
+/var/log/apache2 | Apache logs
+/etc/ssh | Host keys and configs for ssh
+
 ### Secrets
 
 Add these as Kubernetes secrets, or if you're running standalone specify these with source type "file". See the above volume mounts or the sample docker-compose.yml.

images/mythtv-backend/docker-compose.yml

@@ -15,6 +15,7 @@ services:
     - apache2:/var/log/apache2
     - data:/var/mythdata
     - home:/home/mythtv
+    - ssh-config:/etc/ssh
     - /var/mythtv:/var/mythtv
     secrets:
     - mythtv-db-password
@@ -30,3 +31,4 @@ volumes:
   apache2:
   data:
   home:
+  ssh-config:

images/mythtv-backend/helm/values.yaml

@@ -26,6 +26,8 @@ deployment:
 volumeMounts:
 - name: apache-log
   mountPath: /var/log/apache2
+- name: ssh-config
+  mountPath: /etc/ssh
 - name: data
   mountPath: /var/mythdata
 - name: share
@@ -50,6 +52,8 @@ volumeMounts:
 volumes:
 - name: apache-log
   emptyDir: {}
+- name: ssh-config
+  emptyDir: {}
 - name: data
   hostPath: { path: $MYTHTV_VOL_PATH }
 - name: videos

services/mythtv-backend/docker-compose.yml

@@ -15,6 +15,7 @@ services:
     - apache2:/var/log/apache2
     - data:/var/mythdata
     - home:/home/mythtv
+    - ssh-config:/etc/ssh
     - /var/mythtv:/var/mythtv
     - /var/mythtv/arch1:/var/mythtv/arch1
     - /var/mythtv/arch2:/var/mythtv/arch2
@@ -36,3 +37,4 @@ volumes:
   apache2:
   data:
   home:
+  ssh-config: