From 9dd5dfe180e1aff31f8ac071276a12fda816e2aa Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 11 Oct 2022 12:55:44 -0400 Subject: [PATCH] Sync latest dockerfile changes to aarch64 dockerfile; fix mlb typo (#89) * Sync latest dockerfile changes; edits for build to run * add comment to explain * fix typo --- Dockerfile-aarch64 | 14 ++++++++------ root/cronjob.sh | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile-aarch64 b/Dockerfile-aarch64 index 3687c73..6b4180b 100644 --- a/Dockerfile-aarch64 +++ b/Dockerfile-aarch64 @@ -3,7 +3,7 @@ FROM arm64v8/alpine:latest LABEL maintainer="taylorbourne taylorbourne@me.com.com" # Install S6 overlay -ARG S6_OVERLAY_RELEASE=https://github.com/just-containers/s6-overlay/releases/latest/download/s6-overlay-aarch64.tar.gz +ARG S6_OVERLAY_RELEASE=https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-aarch64.tar.gz ENV S6_OVERLAY_RELEASE=${S6_OVERLAY_RELEASE} ADD ${S6_OVERLAY_RELEASE} /tmp/s6overlay.tar.gz @@ -25,14 +25,15 @@ RUN apk upgrade --update --no-cache \ gnutls-utils # pi4 library to run lazystream: https://github.com/ljfranklin/alpine-pkg-glibc/releases/tag/2.32-r0-arm64 +# force needed due to bug: https://github.com/sgerrand/alpine-pkg-glibc/issues/185 RUN wget https://github.com/ljfranklin/alpine-pkg-glibc/releases/download/2.32-r0-arm64/glibc-2.32-r0.apk -RUN apk add --allow-untrusted glibc-2.32-r0.apk +RUN apk add --allow-untrusted --force-overwrite glibc-2.32-r0.apk RUN wget https://github.com/ljfranklin/alpine-pkg-glibc/releases/download/2.32-r0-arm64/glibc-bin-2.32-r0.apk -RUN apk add --allow-untrusted glibc-bin-2.32-r0.apk +RUN apk add --allow-untrusted --force-overwrite glibc-bin-2.32-r0.apk RUN wget https://github.com/ljfranklin/alpine-pkg-glibc/releases/download/2.32-r0-arm64/glibc-i18n-2.32-r0.apk -RUN apk add --allow-untrusted glibc-i18n-2.32-r0.apk +RUN apk add --allow-untrusted --force-overwrite glibc-i18n-2.32-r0.apk # Update Timezone ENV TZ=America/Los_Angeles @@ -42,7 +43,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN wget https://github.com/xteve-project/xTeVe-Downloads/raw/master/xteve_linux_arm64.zip -O temp.zip; unzip temp.zip -d /usr/bin/; rm temp.zip # Add lazystream -RUN wget https://github.com/tarkah/lazystream/releases/download/v1.11.6/lazystream-v1.11.6-aarch64-unknown-linux-gnu.tar.gz -O lazystream.tar.gz; \ +RUN wget https://github.com/tarkah/lazystream/releases/download/v1.12.1/lazystream-v1.12.1-aarch64-unknown-linux-gnu.tar.gz -O lazystream.tar.gz; \ tar xzf lazystream.tar.gz; \ mv ././lazystream /usr/bin/lazystream; \ rm lazystream.tar.gz; \ @@ -88,7 +89,8 @@ ENV PUID=1000 \ embyApiKey= \ embyID= \ use_plexAPI=no \ - trim_xmltv=yes + trim_xmltv=no \ + hostOverride= # Expose Port EXPOSE ${XTEVE_PORT} diff --git a/root/cronjob.sh b/root/cronjob.sh index 303c874..f74240b 100755 --- a/root/cronjob.sh +++ b/root/cronjob.sh @@ -61,7 +61,7 @@ if [ "$use_lazystream" = "yes" ]; then if [ -z "$mlb_start_channel" ]; then mlb_args+=("2000") else - nhl_args+=("$mlb_start_channel") + mlb_args+=("$mlb_start_channel") fi mlb_args+=("/playlists/lazystream/lazystream-mlb")