Merge branch 'develop'

Dockerfile

@@ -21,7 +21,7 @@ RUN chmod 755 /couchpotato.sh
 
 RUN export VERSION=3.0.1 \
     && apt-get -q update \
-    && apt-get install -qy curl python-pip python-dev libz-dev libxml2-dev libxslt1-dev gcc \
+    && apt-get install -qy curl ca-certificates python-pip python-dev libz-dev libxml2-dev libxslt1-dev gcc \
     && curl -o /tmp/couchpotato.tar.gz https://codeload.github.com/CouchPotato/CouchPotatoServer/tar.gz/build/${VERSION} \
     && tar xzf /tmp/couchpotato.tar.gz \
     && mv CouchPotatoServer-* couchpotato \
@@ -37,7 +37,7 @@ RUN export VERSION=3.0.1 \
 # Define container settings.
 #
 
-VOLUME ["/datadir", "/download"]
+VOLUME ["/datadir", "/media"]
 
 EXPOSE 5050
 

README.md

@@ -51,7 +51,7 @@ couchpotato:
 Please mount the following volumes inside your CouchPotato container:
 
 * `/datadir`: Holds all the CouchPotato data files (e.g. config, postProcessing)
-* `/media`: Directory for TV shows
+* `/media`: Directory for movies
 
 ### Configuration file