From 949178ed8cd47085d47e2e7fe3124f52f9fb4920 Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Fri, 7 Oct 2016 01:26:16 +0100
Subject: [PATCH] tidy up Dockerfile

---
 Dockerfile | 34 +++++++++++++++++-----------------
 README.md  |  6 ------
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 544f072..cb73473 100644
--- a/Dockerfile
+++ b/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
-RUN \
- useradd -u 911 -U -d /config -s /bin/false abc && \
- usermod -G users abc && \
- mkdir -p \
-	/app \
-	/config \
-	/defaults
+# set environment variables
+ARG DEBIAN_FRONTEND="noninteractive"
+ENV HOME="/root" \
+TERM="xterm"
 
 # 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}" && \
- tar xvfz /tmp/s6-overlay.tar.gz -C / && \
+	"https://github.com/just-containers/s6-overlay/releases/download/${OVERLAY_VERSION}/s6-overlay-${OVERLAY_ARCH}.tar.gz" && \
+ 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 && \
diff --git a/README.md b/README.md
index 642031f..61736a9 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,3 @@ If you want to comment\contribute to this image, are looking for support on any
 * [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!
-
-
-
-
-
-