cphipps/emby
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

rebase master to focal

Browse Source
This commit is contained in:
thelamer
2020-12-21 12:13:16 -08:00
parent 7aa8442ad1
commit aeecd8606d
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -32,7 +32,7 @@ RUN \
/tmp/opt/emby-server/etc /tmp/opt/emby-server/etc
# runtime stage # runtime stage
FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE

13
Dockerfile.aarch64
View File

@@ -32,7 +32,7 @@ RUN \
/tmp/opt/emby-server/etc /tmp/opt/emby-server/etc
# runtime stage # runtime stage
FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -44,11 +44,18 @@ LABEL maintainer="thelamer"
ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
RUN \ RUN \
echo "**** add emby deps ****" && \ echo "**** install packages ****" && \
apt-get update && \
apt-get install -y --no-install-recommends \
gnupg && \
echo "**** add emby deps *****" && \
curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \
echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa-nightly/ubuntu bionic main">> /etc/apt/sources.list.d/raspbins.list && \
apt-get update && \ apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
libomxil-bellagio0 \ libomxil-bellagio0 \
libomxil-bellagio-bin && \ libomxil-bellagio-bin \
libraspberrypi-bin-nonfree && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
rm -rf \ rm -rf \
/tmp/* \ /tmp/* \

10
Dockerfile.armhf
View File

@@ -32,7 +32,7 @@ RUN \
/tmp/opt/emby-server/etc /tmp/opt/emby-server/etc
# runtime stage # runtime stage
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-bionic FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -44,18 +44,14 @@ LABEL maintainer="thelamer"
ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility" ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
RUN \ RUN \
echo "**** install packages ****" && \
apt-get update && \
apt-get install -y --no-install-recommends \
gnupg && \
echo "**** add emby deps *****" && \ echo "**** add emby deps *****" && \
curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \ curl -s https://keyserver.ubuntu.com/pks/lookup?op=get\&search=0x6587ffd6536b8826e88a62547876ae518cbcf2f2 | apt-key add - && \
echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa/ubuntu bionic main">> /etc/apt/sources.list.d/raspbins.list && \ echo "deb http://ppa.launchpad.net/ubuntu-raspi2/ppa-nightly/ubuntu focal main">> /etc/apt/sources.list.d/raspbins.list && \
apt-get update && \ apt-get update && \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
libomxil-bellagio0 \ libomxil-bellagio0 \
libomxil-bellagio-bin \ libomxil-bellagio-bin \
libraspberrypi0 && \ libraspberrypi-bin-nonfree && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
rm -rf \ rm -rf \
/tmp/* \ /tmp/* \