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

update env vars for bin to run properly and use embies baked in ca cert

Browse Source
This commit is contained in:
thelamer
2019-06-03 14:34:07 -07:00
parent 17bc48734b
commit a8f15fc9af
4 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@@ -15,7 +15,7 @@ RUN \
mkdir -p \ mkdir -p \
/app/emby && \ /app/emby && \
if [ -z ${EMBY_RELEASE+x} ]; then \ if [ -z ${EMBY_RELEASE+x} ]; then \
EMBY_RELEASE=$(curl -s https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest \ EMBY_RELEASE=$(curl -s https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest \
| jq -r '. | .tag_name'); \ | jq -r '. | .tag_name'); \
fi && \ fi && \
curl -o \ curl -o \
@@ -29,7 +29,8 @@ RUN \
/tmp/opt/emby-server/system/* \ /tmp/opt/emby-server/system/* \
/tmp/opt/emby-server/lib/samba/* \ /tmp/opt/emby-server/lib/samba/* \
/tmp/opt/emby-server/lib/* \ /tmp/opt/emby-server/lib/* \
/tmp/opt/emby-server/bin/ff* /tmp/opt/emby-server/bin/ff* \
/tmp/opt/emby-server/etc
# runtime stage # runtime stage
FROM lsiobase/ubuntu:bionic FROM lsiobase/ubuntu:bionic
@@ -47,11 +48,6 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
COPY --from=buildstage /app/emby /app/emby COPY --from=buildstage /app/emby /app/emby
COPY root/ / COPY root/ /
# lib setup
RUN \
echo "/app/emby" > /etc/ld.so.conf.d/emby.conf && \
ldconfig
# ports and volumes # ports and volumes
EXPOSE 8096 8920 EXPOSE 8096 8920
VOLUME /config /transcode VOLUME /config /transcode

15
Dockerfile.aarch64
View File

@@ -1,4 +1,4 @@
FROM lsiobase/ubuntu:arm64v8-bionic as buildstage FROM lsiobase/ubuntu:bionic as buildstage
# build args # build args
ARG EMBY_RELEASE ARG EMBY_RELEASE
@@ -15,7 +15,7 @@ RUN \
mkdir -p \ mkdir -p \
/app/emby && \ /app/emby && \
if [ -z ${EMBY_RELEASE+x} ]; then \ if [ -z ${EMBY_RELEASE+x} ]; then \
EMBY_RELEASE=$(curl -s https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest \ EMBY_RELEASE=$(curl -s https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest \
| jq -r '. | .tag_name'); \ | jq -r '. | .tag_name'); \
fi && \ fi && \
curl -o \ curl -o \
@@ -29,10 +29,11 @@ RUN \
/tmp/opt/emby-server/system/* \ /tmp/opt/emby-server/system/* \
/tmp/opt/emby-server/lib/samba/* \ /tmp/opt/emby-server/lib/samba/* \
/tmp/opt/emby-server/lib/* \ /tmp/opt/emby-server/lib/* \
/tmp/opt/emby-server/bin/ff* /tmp/opt/emby-server/bin/ff* \
/tmp/opt/emby-server/etc
# runtime stage # runtime stage
FROM lsiobase/ubuntu:arm64v8-bionic FROM lsiobase/ubuntu:bionic
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -47,12 +48,6 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
COPY --from=buildstage /app/emby /app/emby COPY --from=buildstage /app/emby /app/emby
COPY root/ / COPY root/ /
# lib setup
RUN \
echo "**** add lib path ****" && \
echo "/app/emby" > /etc/ld.so.conf.d/emby.conf && \
ldconfig
# ports and volumes # ports and volumes
EXPOSE 8096 8920 EXPOSE 8096 8920
VOLUME /config /transcode VOLUME /config /transcode

11
Dockerfile.armhf
View File

@@ -15,7 +15,7 @@ RUN \
mkdir -p \ mkdir -p \
/app/emby && \ /app/emby && \
if [ -z ${EMBY_RELEASE+x} ]; then \ if [ -z ${EMBY_RELEASE+x} ]; then \
EMBY_RELEASE=$(curl -s https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest \ EMBY_RELEASE=$(curl -s https://api.github.com/repos/MediaBrowser/Emby.Releases/releases/latest \
| jq -r '. | .tag_name'); \ | jq -r '. | .tag_name'); \
fi && \ fi && \
curl -o \ curl -o \
@@ -29,7 +29,8 @@ RUN \
/tmp/opt/emby-server/system/* \ /tmp/opt/emby-server/system/* \
/tmp/opt/emby-server/lib/samba/* \ /tmp/opt/emby-server/lib/samba/* \
/tmp/opt/emby-server/lib/* \ /tmp/opt/emby-server/lib/* \
/tmp/opt/emby-server/bin/ff* /tmp/opt/emby-server/bin/ff* \
/tmp/opt/emby-server/etc
# runtime stage # runtime stage
FROM lsiobase/ubuntu:arm32v7-bionic FROM lsiobase/ubuntu:arm32v7-bionic
@@ -47,12 +48,6 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
COPY --from=buildstage /app/emby /app/emby COPY --from=buildstage /app/emby /app/emby
COPY root/ / COPY root/ /
# lib setup
RUN \
echo "**** add lib path ****" && \
echo "/app/emby" > /etc/ld.so.conf.d/emby.conf && \
ldconfig
# ports and volumes # ports and volumes
EXPOSE 8096 8920 EXPOSE 8096 8920
VOLUME /config /transcode VOLUME /config /transcode

9
root/etc/services.d/emby/run
View File

@@ -1,5 +1,14 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
# env settings
APP_DIR="/app/emby"
export LD_LIBRARY_PATH="${APP_DIR}"
export FONTCONFIG_PATH="${APP_DIR}"/etc/fonts
if [ -d "/lib/x86_64-linux-gnu" ]; then
export LIBVA_DRIVERS_PATH="${APP_DIR}":/usr/lib/x86_64-linux-gnu/dri:/usr/lib64/dri:/usr/lib/dri
fi
export SSL_CERT_FILE="${APP_DIR}"/etc/ssl/certs/ca-certificates.crt
exec \ exec \
s6-setuidgid abc /app/emby/EmbyServer \ s6-setuidgid abc /app/emby/EmbyServer \
-programdata /config \ -programdata /config \