From 46e95f4da6a944a909b85d0194b5c6227fdc7e07 Mon Sep 17 00:00:00 2001
From: sparklyballs <sparklyballs@gmail.com>
Date: Wed, 5 Sep 2018 10:56:07 +0100
Subject: [PATCH] rebase to alpine 3.8

---
 Dockerfile                     | 11 ++++++-----
 README.md                      |  1 +
 root/etc/cont-init.d/50-config |  6 +++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0d4d4c9..4b0a9b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM lsiobase/alpine.nginx:3.7
+FROM lsiobase/alpine.nginx:3.8
 
 # set version label
 ARG BUILD_DATE
@@ -9,8 +9,8 @@ LABEL maintainer="aptalca"
 # environment settings
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
-# install packages
 RUN \
+ echo "**** install runtime pacakges ****" && \
  apk add --no-cache \
 	curl \
 	php7-ctype \
@@ -18,18 +18,19 @@ RUN \
 	php7-tokenizer \
 	tar && \
  echo "**** install heimdall ****" && \
- HEIM_VER="$(curl -sX GET https://api.github.com/repos/linuxserver/Heimdall/releases/latest | grep 'tag_name' | cut -d\" -f4)" && \
  mkdir -p \
 	/var/www/localhost/heimdall && \
+ HEIM_VER=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
+	| awk '/tag_name/{print $4;exit}' FS='[""]') && \
  curl -o \
  /tmp/heimdall.tar.gz -L \
 	"https://github.com/linuxserver/Heimdall/archive/${HEIM_VER}.tar.gz" && \
  tar xf \
  /tmp/heimdall.tar.gz -C \
 	/var/www/localhost/heimdall --strip-components=1 && \
- echo "** cleanup **" && \
+ echo "**** cleanup ****" && \
  rm -rf \
- /tmp/*
+	/tmp/*
 
 # add local files
 COPY root/ /
diff --git a/README.md b/README.md
index fdbfff5..a70845c 100644
--- a/README.md
+++ b/README.md
@@ -86,5 +86,6 @@ This image now supports password protection through htpasswd. Run the following
 
 ## Versions
 
++ **05.09.18:** Rebase to alpine linux 3.8.
 + **06.03.18:** Use password protection if htpasswd is set. Existing users can delete their default site config at /config/nginx/site-confs/default and restart the container, a new default site config with htpasswd support will be created in its place
 + **12.02.18:** Initial Release.
diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config
index 1564f49..2c05c23 100644
--- a/root/etc/cont-init.d/50-config
+++ b/root/etc/cont-init.d/50-config
@@ -1,10 +1,10 @@
 #!/usr/bin/with-contenv bash
 
-# create folders
+# make our folders
 mkdir -p \
-  /config/www/{backgrounds,icons}
+	/config/www/{backgrounds,icons}
 
-# symlink user config
+# create symlinks
 
 symlinks=( \
 /var/www/localhost/heimdall/storage/app/public/backgrounds \