Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/roles/mythfrontend/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ ir_device:
mythdb_overrides: {}
db: "{{ db_defaults | combine(mythdb_overrides) }}"

mythtv_version: 35
mythtv_version: 36

network_defaults:
address: "{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}"
Expand Down
11 changes: 4 additions & 7 deletions images/mythtv-backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,16 @@ ENV APACHE_LOG_DIR=/var/log/apache2 \
LOCALHOSTNAME= \
TZ=UTC

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

RUN \
apt-get -yq update && \
apt-get install -yq gnupg locales wget && \
apt-key adv --recv-keys --keyserver keyserver.ubuntu.com $APT_SIG && \
echo "deb $MYTHTV_PPA/ubuntu noble main" \
> /etc/apt/sources.list.d/mythbuntu.list && \
apt-get install -yq gnupg locales software-properties-common wget && \
add-apt-repository $MYTHTV_PPA && \
apt-get -yq update && \
locale-gen $LANG && \
echo "# added via Dockerfile\npath-include=/usr/share/doc/mythtv-backend/contrib/*" > \
Expand Down
2 changes: 1 addition & 1 deletion images/mythtv-backend/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ sources:
- https://github.com/mythtv/mythtv
type: application
version: 0.1.18
appVersion: "35.0-fixes.202512301852.805e05b76a"
appVersion: "36.0-fixes.202602100833.1385cbfc60"
dependencies:
- name: chartlib
version: 0.1.8
Expand Down
4 changes: 0 additions & 4 deletions images/mythtv-backend/src/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,16 @@ OSTYPE=`grep ^ID= /etc/os-release|cut -f 2 -d=`

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

# TODO - clean out dangling references to apache2, which is no longer used

if [ "$OSTYPE" == "opensuse" ]; then
ln -fns /usr/share/zoneinfo/$TZ /etc/localtime
CONF_DIR=/etc/apache2/conf.d
elif [ "$OSTYPE" == "ubuntu" ]; then
if [[ $(cat /etc/timezone) != $TZ ]]; then
echo $TZ > /etc/timezone
DIR=/etc/php/$(php -v|grep PHP | grep -oP "\\d+\.\\d+" | head -1)
echo "date.timezone = $TZ" > $DIR/apache2/conf.d/50-tz.ini
echo "date.timezone = $TZ" > $DIR/cli/conf.d/50-tz.ini
dpkg-reconfigure -f noninteractive tzdata
fi
CONF_DIR=/etc/apache2/sites-available
fi

if [ -e /run/secrets/mythtv-db-password ]; then
Expand Down
2 changes: 2 additions & 0 deletions k8s/helm/wordpress/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ deployment:
secretKeyRef:
name: wordpress
key: WORDPRESS_NONCE_SALT
securityContext:
runAsUser: 33

volumeMounts:
- mountPath: /usr/local/etc/php/conf.d/local-php.ini
Expand Down
Loading