Merge pull request #121 from linuxserver/continuation_lines
fix continuation lines xenial
This commit is contained in:
commit
158d3f65ad
2 changed files with 6 additions and 8 deletions
13
Dockerfile
13
Dockerfile
|
|
@ -1,10 +1,10 @@
|
||||||
FROM lsiobase/xenial
|
FROM lsiobase/xenial
|
||||||
MAINTAINER Stian Larsen, sparklyballs
|
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||||
|
LABEL maintainer="stian larsen,sparklyballs"
|
||||||
|
|
||||||
# global environment settings
|
# global environment settings
|
||||||
ENV DEBIAN_FRONTEND="noninteractive" \
|
ENV DEBIAN_FRONTEND="noninteractive" \
|
||||||
|
|
@ -16,25 +16,22 @@ PLEX_MEDIA_SERVER_INFO_DEVICE=docker \
|
||||||
PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6" \
|
PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6" \
|
||||||
PLEX_MEDIA_SERVER_USER=abc
|
PLEX_MEDIA_SERVER_USER=abc
|
||||||
|
|
||||||
# install packages
|
|
||||||
RUN \
|
RUN \
|
||||||
|
echo "**** install packages ****" && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
apt-get install -y \
|
apt-get install -y \
|
||||||
avahi-daemon \
|
avahi-daemon \
|
||||||
dbus \
|
dbus \
|
||||||
unrar \
|
unrar \
|
||||||
wget && \
|
wget && \
|
||||||
|
echo "**** install plex ****" && \
|
||||||
# install plex
|
|
||||||
curl -o \
|
curl -o \
|
||||||
/tmp/plexmediaserver.deb -L \
|
/tmp/plexmediaserver.deb -L \
|
||||||
"${PLEX_INSTALL}" && \
|
"${PLEX_INSTALL}" && \
|
||||||
dpkg -i /tmp/plexmediaserver.deb && \
|
dpkg -i /tmp/plexmediaserver.deb && \
|
||||||
|
echo "**** change abc home folder to fix plex hanging at runtime with usermod ****" && \
|
||||||
# change abc home folder to fix plex hanging at runtime with usermod
|
|
||||||
usermod -d /app abc && \
|
usermod -d /app abc && \
|
||||||
|
echo "**** cleanup ****" && \
|
||||||
# cleanup
|
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
rm -rf \
|
rm -rf \
|
||||||
/etc/default/plexmediaserver \
|
/etc/default/plexmediaserver \
|
||||||
|
|
|
||||||
|
|
@ -108,6 +108,7 @@ To upgrade to the latest version (see setting up application section) : `docker
|
||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
+ **09.12.17:** Fix continuation lines.
|
||||||
+ **12.07.17:** Add inspect commands to README, move to jenkins build and push.
|
+ **12.07.17:** Add inspect commands to README, move to jenkins build and push.
|
||||||
+ **28.05.17:** Add unrar package as per requests, for subzero plugin.
|
+ **28.05.17:** Add unrar package as per requests, for subzero plugin.
|
||||||
+ **11.01.17:** Use Plex environemt variables from pms docker,
|
+ **11.01.17:** Use Plex environemt variables from pms docker,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue