Skip to content

Commit 801c58e

Browse files
authored
SYS-674 MythTV 36.0 update (#260)
1 parent d8435d2 commit 801c58e

5 files changed

Lines changed: 8 additions & 13 deletions

File tree

ansible/roles/mythfrontend/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ ir_device:
230230
mythdb_overrides: {}
231231
db: "{{ db_defaults | combine(mythdb_overrides) }}"
232232

233-
mythtv_version: 35
233+
mythtv_version: 36
234234

235235
network_defaults:
236236
address: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}"

images/mythtv-backend/Dockerfile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,16 @@ ENV APACHE_LOG_DIR=/var/log/apache2 \
1717
LOCALHOSTNAME= \
1818
TZ=UTC
1919

20-
ARG APT_SIG=13551B881504888C
2120
ARG MYTHTV_GID=100
2221
ARG MYTHTV_UID=2021
23-
ARG MYTHTV_PPA=http://ppa.launchpad.net/mythbuntu/35
24-
ARG MYTHTV_VERSION=2:35.0+fixes.202512301852.805e05b76a~ubuntu24.04.1
22+
ARG MYTHTV_PPA=ppa:mythbuntu/36
23+
ARG MYTHTV_VERSION=2:36.0+fixes.202602100833.1385cbfc60~ubuntu24.04.1
2524
ARG MYTHLINK_SHA=459cb8b60adae4b631a95a9cfb1b41dcb959cc4a0b9053582a711d58b8d8a0d2
2625

2726
RUN \
2827
apt-get -yq update && \
29-
apt-get install -yq gnupg locales wget && \
30-
apt-key adv --recv-keys --keyserver keyserver.ubuntu.com $APT_SIG && \
31-
echo "deb $MYTHTV_PPA/ubuntu noble main" \
32-
> /etc/apt/sources.list.d/mythbuntu.list && \
28+
apt-get install -yq gnupg locales software-properties-common wget && \
29+
add-apt-repository $MYTHTV_PPA && \
3330
apt-get -yq update && \
3431
locale-gen $LANG && \
3532
echo "# added via Dockerfile\npath-include=/usr/share/doc/mythtv-backend/contrib/*" > \

images/mythtv-backend/helm/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ sources:
77
- https://github.com/mythtv/mythtv
88
type: application
99
version: 0.1.18
10-
appVersion: "35.0-fixes.202512301852.805e05b76a"
10+
appVersion: "36.0-fixes.202602100833.1385cbfc60"
1111
dependencies:
1212
- name: chartlib
1313
version: 0.1.8

images/mythtv-backend/src/entrypoint.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,16 @@ OSTYPE=`grep ^ID= /etc/os-release|cut -f 2 -d=`
55

66
localedef -i $(cut -d. -f1 <<< $LANGUAGE) -f $(cut -d. -f2 <<< $LANGUAGE) $LANG
77

8-
# TODO - clean out dangling references to apache2, which is no longer used
9-
108
if [ "$OSTYPE" == "opensuse" ]; then
119
ln -fns /usr/share/zoneinfo/$TZ /etc/localtime
1210
CONF_DIR=/etc/apache2/conf.d
1311
elif [ "$OSTYPE" == "ubuntu" ]; then
1412
if [[ $(cat /etc/timezone) != $TZ ]]; then
1513
echo $TZ > /etc/timezone
1614
DIR=/etc/php/$(php -v|grep PHP | grep -oP "\\d+\.\\d+" | head -1)
17-
echo "date.timezone = $TZ" > $DIR/apache2/conf.d/50-tz.ini
1815
echo "date.timezone = $TZ" > $DIR/cli/conf.d/50-tz.ini
1916
dpkg-reconfigure -f noninteractive tzdata
2017
fi
21-
CONF_DIR=/etc/apache2/sites-available
2218
fi
2319

2420
if [ -e /run/secrets/mythtv-db-password ]; then

k8s/helm/wordpress/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ deployment:
4949
secretKeyRef:
5050
name: wordpress
5151
key: WORDPRESS_NONCE_SALT
52+
securityContext:
53+
runAsUser: 33
5254

5355
volumeMounts:
5456
- mountPath: /usr/local/etc/php/conf.d/local-php.ini

0 commit comments

Comments
 (0)