Merge pull request #3 from linuxserver/tidy-up

Tidy up

Dockerfile

@@ -1,25 +1,14 @@
 FROM ubuntu:16.04
 MAINTAINER sparklyballs
 
-# set environment variables
-ARG DEBIAN_FRONTEND="noninteractive"
-ENV HOME="/root"
-ENV TERM="xterm"
-
 # set version for s6 overlay
 ARG OVERLAY_VERSION="v1.18.1.5"
 ARG OVERLAY_ARCH="amd64"
-ARG OVERLAY_URL="https://github.com/just-containers/s6-overlay/releases/download"
-ARG OVERLAY_WWW="${OVERLAY_URL}"/"${OVERLAY_VERSION}"/s6-overlay-"${OVERLAY_ARCH}".tar.gz
 
-# create abc user and make folders
+# set environment variables
-RUN \
+ARG DEBIAN_FRONTEND="noninteractive"
- useradd -u 911 -U -d /config -s /bin/false abc && \
+ENV HOME="/root" \
- usermod -G users abc && \
+TERM="xterm"
- mkdir -p \
-	/app \
-	/config \
-	/defaults
 
 # copy sources
 COPY sources.list /etc/apt/
@@ -37,8 +26,19 @@ RUN \
 # add s6 overlay
  curl -o \
  /tmp/s6-overlay.tar.gz -L \
-	"${OVERLAY_WWW}" && \
+	"https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz" && \
- tar xvfz /tmp/s6-overlay.tar.gz -C / && \
+ tar xfz \
+	/tmp/s6-overlay.tar.gz -C / && \
+
+# create abc user
+ useradd -u 911 -U -d /config -s /bin/false abc && \
+ usermod -G users abc && \
+
+# make our folders
+ mkdir -p \
+	/app \
+	/config \
+	/defaults && \
 
 # cleanup
  apt-get clean && \

README.md

@@ -1,9 +1,18 @@
-![https://linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)
+[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]
 
 [Dockerfile](https://github.com/linuxserver/docker-baseimage-xenial/blob/master/Dockerfile)
 
+[![](https://images.microbadger.com/badges/image/lsiobase/xenial.svg)](https://microbadger.com/images/lsiobase/xenial "Get your own image badge on microbadger.com")[![Build Status](http://jenkins.linuxserver.io:8080/job/Dockers/job/BaseImages/job/lsiobase-xenial/badge/icon)](http://jenkins.linuxserver.io:8080/job/Dockers/job/BaseImages/job/lsiobase-xenial/)
+
 ### This base container is not aimed at public consumption. It exists to serve as a single endpoint for LinuxServer.io containers and is based upon [Ubuntu Xenial](https://hub.docker.com/_/ubuntu/)
 
-If you want to comment\contribute to our work, feel free to join us at out irc channel:
+If you want to comment\contribute to this image, are looking for support on any of our other work , or are curious about us in general, check out the following.
-[IRC](https://www.linuxserver.io/index.php/irc/) on freenode at `#linuxserver.io` or visit our website at [https://linuxserver.io](https://linuxserver.io).
 
+* [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!