Migrate to phusion and enable edge mode

Author: needo

Dockerfile

@@ -1,7 +1,13 @@
-FROM debian:jessie
+FROM phusion/baseimage:0.9.11
 MAINTAINER needo <[email protected]>
 ENV DEBIAN_FRONTEND noninteractive
 
+# Set correct environment variables
+ENV HOME /root
+
+# Use baseimage-docker's init system
+CMD ["/sbin/my_init"]
+
 # Fix a Debianism of the nobody's uid being 65534
 RUN usermod -u 99 nobody
 RUN usermod -g 100 nobody
@@ -28,7 +34,12 @@ VOLUME /downloads
 # Movies directory
 VOLUME /movies
 
-# Because running things as root is wrong
-USER nobody
-ENTRYPOINT ["python", "/opt/couchpotato/CouchPotato.py"]
-CMD ["--config_file=/config/config.ini", "--data_dir=/config/data"]
+# Add edge.sh to execute during container startup
+RUN mkdir -p /etc/my_init.d
+ADD edge.sh /etc/my_init.d/edge.sh
+RUN chmod +x /etc/my_init.d/edge.sh
+
+# Add CouchPotato to runit
+RUN mkdir /etc/service/couchpotato
+ADD couchpotato.sh /etc/service/couchpotato/run
+RUN chmod +x /etc/service/couchpotato/run

README.md

@@ -1,5 +1,12 @@
 This is a Dockerfile setup for couchpotato - https://couchpota.to/
 
-To run:
+By default this Docker installs the latest stable version of CouchPotato:
 
 docker run -d --net="host" --name="couchpotato" -v /path/to/couchpotato/data:/config -v /path/to/downloads:/downloads -v /path/to/movies:/movies -v /etc/localtime:/etc/localtime:ro -p 5050:5050 needo/couchpotato
+
+Edge
+----
+If you would like to run the latest updates from the master branch as well as enable in-app updates run:
+
+docker run -d --net="host" --name="couchpotato" -v /path/to/couchpotato/data:/config -v /path/to/downloads:/download
+s -v /path/to/movies:/movies -v /etc/localtime:/etc/localtime:ro -e EDGE=1 -p 5050:5050 needo/couchpotato

couchpotato.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec /sbin/setuser nobody python /opt/couchpotato/CouchPotato.py --config_file=/config/config.ini --data_dir=/config/data

edge.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Does the user want the latest version
+if [ -z "$EDGE" ]; then
+  echo "Bleeding edge not requested"
+else
+  apt-get install -qy git
+  rm -rf /opt/couchpotato
+  git clone https://github.com/RuudBurger/CouchPotatoServer.git /opt/couchpotato
+  chown -R nobody:users /opt/couchpotato
+fi