Merge pull request #21 from linuxserver/develop_readme_consistent_urls

Develop readme consistent urls

Dockerfile

@@ -1,41 +1,41 @@
-FROM lsiobase/xenial
-MAINTAINER sparklyballs
-
-# environment settings
-ARG DEBIAN_FRONTEND="noninteractive"
-ENV XDG_CONFIG_HOME="/config/xdg"
+FROM lsiobase/mono
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="sparklyballs"
+
+# environment settings
+ARG DEBIAN_FRONTEND="noninteractive"
+ARG RADARR_BRANCH="develop"
+ENV XDG_CONFIG_HOME="/config/xdg"
 
-# install packages
 RUN \
+ echo "**** install jq ****" && \
  apt-get update && \
  apt-get install -y \
-	libcurl3 \
-	libmono-cil-dev && \
-
-# install radarr
+	jq && \
+ echo "**** install radarr ****" && \
+ radarr_url=$(curl "http://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \
+	| jq -r '.[0].url') && \
  mkdir -p \
-	/app/radarr && \
+	/opt/radarr && \
  curl -o \
  /tmp/radar.tar.gz -L \
-	https://github.com/galli-leo/Radarr/releases/download/v0.2.0.45/Radarr.develop.0.2.0.45.linux.tar.gz && \
- tar xf \
+	"${radarr_url}" && \
+ tar ixzf \
  /tmp/radar.tar.gz -C \
-	/app/radarr --strip-components=1 && \
-
-# clean up
+	/opt/radarr --strip-components=1 && \
+ echo "**** clean up ****" && \
  rm -rf \
 	/tmp/* \
 	/var/lib/apt/lists/* \
 	/var/tmp/*
 
-# add local files
+# add local files
 COPY /root /
 
-# ports and volumes
+# ports and volumes
 EXPOSE 7878
 VOLUME /config /downloads /movies

README.md

@@ -2,14 +2,106 @@
 [forumurl]: https://forum.linuxserver.io
 [ircurl]: https://www.linuxserver.io/irc/
 [podcasturl]: https://www.linuxserver.io/podcast/
+[appurl]: https://github.com/Radarr/Radarr
+[hub]: https://hub.docker.com/r/linuxserver/radarr/
 
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
 
-## This is a Container in active development by the [LinuxServer.io][linuxserverurl] team and is not recommended for use by the general public.
-
-If you want to comment\contribute on this container , are looking for support on any of our other work , or are curious about us in general, check out the following.
-
+The [LinuxServer.io][linuxserverurl] team brings you another container release featuring easy user mapping and community support. Find us for support at:
 * [forum.linuxserver.io][forumurl]
 * [IRC][ircurl] on freenode at `#linuxserver.io`
 * [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
 
+# linuxserver/radarr
+[![](https://images.microbadger.com/badges/version/linuxserver/radarr.svg)](https://microbadger.com/images/linuxserver/radarr "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/radarr.svg)](https://microbadger.com/images/linuxserver/radarr "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/radarr.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/radarr.svg)][hub][![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Builders/x86-64/x86-64-radarr)](https://ci.linuxserver.io/job/Docker-Builders/job/x86-64/job/x86-64-radarr/)
+
+[Radarr][appurl] - A fork of Sonarr to work with movies à la Couchpotato. 
+
+[![radarr](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/radarr.png)][appurl]
+
+## Usage
+
+```
+docker create \
+  --name=radarr \
+	-v <path to data>:/config \
+	-v <path to data>:/downloads \
+	-v <path to data>:/movies \
+	-v /etc/localtime:/etc/localtime:ro \
+	-e TZ=<timezone> \
+	-e PGID=<gid> -e PUID=<uid>  \
+	-p 7878:7878 \
+  linuxserver/radarr
+```
+
+You can choose between ,using tags, various branch versions of radarr, no tag is required to remain on the main branch.
+
+Add one of the tags,  if required,  to the linuxserver/radarr line of the run/create command in the following format, linuxserver/radarr:nightly
+
+The nightly branch and master branch can from time to time be the same version.
+
+HOWEVER , USE THE NIGHTLY BRANCH AT YOUR OWN PERIL !!!!!!!!!
+
+#### Tags
+
++ **nightly**
+
+## Parameters
+
+`The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side. 
+For example with a port -p external:internal - what this shows is the port mapping from internal to external of the container.
+So -p 8080:80 would expose port 80 from inside the container to be accessible from the host's IP on port 8080
+http://192.168.x.x:8080 would show you what's running INSIDE the container on port 80.`
+
+
+* `-p 7878` - the port(s)
+* `-v /config` - Radarr Application Data
+* `-v /downloads` - Downloads Folder
+* `-v /movies` - Movie Share
+* `-v /etc/localtime` for timesync - see [Localtime](#localtime) for important information
+* `-e TZ` for timezone information, Europe/London - see [Localtime](#localtime) for important information
+* `-e PGID` for for GroupID - see below for explanation
+* `-e PUID` for for UserID - see below for explanation
+
+It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it radarr /bin/bash`.
+
+## Localtime
+
+It is important that you either set `-v /etc/localtime:/etc/localtime:ro` or the TZ variable, mono will throw exceptions without one of them set.
+
+### User / Group Identifiers
+
+Sometimes when using data volumes (`-v` flags) permissions issues can arise between the host OS and the container. We avoid this issue by allowing you to specify the user `PUID` and group `PGID`. Ensure the data volume directory on the host is owned by the same user you specify and it will "just work" ™.
+
+In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as below:
+
+```
+  $ id <dockeruser>
+    uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
+```
+
+## Setting up the application
+
+Access the webui at `<your-ip>:7878`, for more information check out [Radarr][appurl].
+
+## Info
+
+* Shell access whilst the container is running: `docker exec -it radarr /bin/bash`
+* To monitor the logs of the container in realtime: `docker logs -f radarr`
+
+* container version number 
+
+`docker inspect -f '{{ index .Config.Labels "build_version" }}' radarr`
+
+* image version number
+
+`docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/radarr`
+
+## Versions
+
++ **24.02.18:** Add nightly branch.
++ **06.02.18:** Radarr repo changed owner.
++ **15.12.17:** Fix continuation lines.
++ **17.04.17:** Switch to using inhouse mono baseimage, adds python also.
++ **13.04.17:** Switch to official mono repository.
++ **10.01.17:** Initial Release.

READMETEMPLATE.md

@@ -1,84 +0,0 @@
-[linuxserverurl]: https://linuxserver.io
-[forumurl]: https://forum.linuxserver.io
-[ircurl]: https://www.linuxserver.io/irc/
-[podcasturl]: https://www.linuxserver.io/podcast/
-
-[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
-
-The [LinuxServer.io][linuxserverurl] team brings you another container release featuring easy user mapping and community support. Find us for support at:
-* [forum.linuxserver.io][forumurl]
-* [IRC][ircurl] on freenode at `#linuxserver.io`
-* [Podcast][podcasturl] covers everything to do with getting the most from your Linux Server plus a focus on all things Docker and containerisation!
-
-# linuxserver/radarr
-[![](https://images.microbadger.com/badges/image/linuxserver/radarr.svg)](http://microbadger.com/images/linuxserver/radarr "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/radarr.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/radarr.svg)][hub][![Build Status](http://jenkins.linuxserver.io:8080/buildStatus/icon?job=Dockers/LinuxServer.io-hub-built/linuxserver-radarr)](http://jenkins.linuxserver.io:8080/job/Dockers/job/LinuxServer.io-hub-built/job/linuxserver-radarr/)
-[hub]: https://hub.docker.com/r/linuxserver/radarr/
-
-A fork of Sonarr which aims to turn it into something like Couchpotato.
-
-[![radarr]()][radarrurl]
-[radarrurl]: https://github.com/Radarr/Radarr
-
-## Usage
-
-```
-docker create \
-  --name=radarr \
-	-v <path to data>:/config \
-	-v <path to data>:/downloads \
-	-v <path to data>:/movies \
-	-e PGID=<gid> -e PUID=<uid>  \
-	-e TZ=<timezone> \
-	-p 7878:7878 \
-  linuxserver/radarr
-```
-
-## Parameters
-
-`The parameters are split into two halves, separated by a colon, the left hand side representing the host and the right the container side. 
-For example with a port -p external:internal - what this shows is the port mapping from internal to external of the container.
-So -p 8080:80 would expose port 80 from inside the container to be accessible from the host's IP on port 8080
-http://192.168.x.x:8080 would show you what's running INSIDE the container on port 80.`
-
-
-* `-p 7878` - the port(s)
-* `-v /config` - Radarr Application Data
-* `-v /downloads` - Downloads Folder
-* `-v /movies` - Movie Share
-* `-e PGID` for for GroupID - see below for explanation
-* `-e PUID` for for UserID - see below for explanation
-* `-e TZ` for timezone information, eg Europe/London
-
-It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it radarr /bin/bash`.
-
-### User / Group Identifiers
-
-Sometimes when using data volumes (`-v` flags) permissions issues can arise between the host OS and the container. We avoid this issue by allowing you to specify the user `PUID` and group `PGID`. Ensure the data volume directory on the host is owned by the same user you specify and it will "just work" ™.
-
-In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as below:
-
-```
-  $ id <dockeruser>
-    uid=1001(dockeruser) gid=1001(dockergroup) groups=1001(dockergroup)
-```
-
-## Setting up the application
-
-Access the webui at `<your-ip>:7878`, for more information check out [Radarr][radarrurl].
-
-## Info
-
-* Shell access whilst the container is running: `docker exec -it radarr /bin/bash`
-* To monitor the logs of the container in realtime: `docker logs -f radarr`
-
-* container version number 
-
-`docker inspect -f '{{ index .Config.Labels "build_version" }}' radarr`
-
-* image version number
-
-`docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/radarr`
-
-## Versions
-
-+ **dd.MM.yy:** Initial Release.

root/etc/cont-init.d/30-config

@@ -3,5 +3,5 @@
 # permissions
 chown -R abc:abc \
 	/config \
-	/app
+	/opt
 

root/etc/services.d/radarr/run

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-cd /app/radarr || exit
+cd /opt/radarr || exit
 
 exec \
 	s6-setuidgid abc mono --debug Radarr.exe \