use HEIM_VER in place of VERSION to avoid confusion with env var

Remove baseurl, change www location

Dockerfile

@@ -17,19 +17,19 @@ RUN \
 	php7-pdo_sqlite \
 	php7-tokenizer \
 	tar && \
- mkdir -p /app/heimdall && \
- VERSION="$(curl -sX GET https://api.github.com/repos/linuxserver/Heimdall/releases/latest | grep 'tag_name' | cut -d\" -f4)" && \
- echo "**Installing Heimdall ${VERSION}**" && \
+ 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 && \
  curl -o \
-  /tmp/heimdall.tar.gz -L \
-  "https://github.com/linuxserver/Heimdall/archive/${VERSION}.tar.gz" && \
+ /tmp/heimdall.tar.gz -L \
+	"https://github.com/linuxserver/Heimdall/archive/${HEIM_VER}.tar.gz" && \
  tar xf \
-  /tmp/heimdall.tar.gz -C \
-  /tmp && \
- cp -R /tmp/Heimdall-*/* /app/heimdall/ && \
+ /tmp/heimdall.tar.gz -C \
+	/var/www/localhost/heimdall --strip-components=1 && \
  echo "** cleanup **" && \
  rm -rf \
-  /tmp/*
+ /tmp/*
 
 # add local files
 COPY root/ /

README.md

@@ -2,85 +2,14 @@
 [forumurl]: https://forum.linuxserver.io
 [ircurl]: https://www.linuxserver.io/irc/
 [podcasturl]: https://www.linuxserver.io/podcast/
-[appurl]: https://github.com/linuxserver/Heimdall
-[hub]: https://hub.docker.com/r/linuxserver/heimdall/
 
 [![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:
+## 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.
+
 * [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/heimdall
-[![](https://images.microbadger.com/badges/version/linuxserver/nginx.svg)](https://microbadger.com/images/linuxserver/nginx "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/nginx.svg)](https://microbadger.com/images/linuxserver/nginx "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/nginx.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/nginx.svg)][hub][![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Builders/x86-64/x86-64-nginx)](https://ci.linuxserver.io/job/Docker-Builders/job/x86-64/job/x86-64-nginx/)
-
-Heimdall is a way to organise all those links to your most used web sites and web applications in a simple way.
-
-Simplicity is the key to Heimdall.
-
-Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.
-
-[![nginx](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/nginx-banner.png)][appurl]
-
-## Usage
-
-```
-docker create \
---name=heimdall \
--v <path to data>:/config \
--e PGID=<gid> -e PUID=<uid>  \
--p 80:80 -p 443:443 \
--e TZ=<timezone> \
-linuxserver/heimdall
-```
-
-## 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 80` - The web-services.
-* `-p 443` - The SSL-Based Webservice
-* `-v /config` - Contains your www content and all relevant configuration files.
-* `-e PGID` for GroupID - see below for explanation
-* `-e PUID` for UserID - see below for explanation
-* `-e TZ` - timezone ie. `America/New_York`
-* `-e BASEURL` - _optional_ - you can set a base url through this variable to serve the app at http://SERVERIP:PORT/BASEURL
-
-It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it heimdall /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 web gui at http://SERVERIP:PORT
-
-## Info
-
-* To monitor the logs of the container in realtime `docker logs -f heimdall`.
-
-
-* container version number 
-
-`docker inspect -f '{{ index .Config.Labels "build_version" }}' heimdall`
-
-* image version number
-
-`docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/heimdall`
-
-## Versions
-
-+ **XX.02.18:** Intial Release.

READMETEMPLATE.md

@@ -0,0 +1,86 @@
+[linuxserverurl]: https://linuxserver.io
+[forumurl]: https://forum.linuxserver.io
+[ircurl]: https://www.linuxserver.io/irc/
+[podcasturl]: https://www.linuxserver.io/podcast/
+[appurl]: https://github.com/linuxserver/Heimdall
+[hub]: https://hub.docker.com/r/linuxserver/heimdall/
+
+[![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/heimdall
+[![](https://images.microbadger.com/badges/version/linuxserver/heimdall.svg)](https://microbadger.com/images/linuxserver/heimdall "Get your own version badge on microbadger.com")[![](https://images.microbadger.com/badges/image/linuxserver/heimdall.svg)](https://microbadger.com/images/linuxserver/heimdall "Get your own image badge on microbadger.com")[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg)][hub][![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg)][hub][![Build Status](https://ci.linuxserver.io/buildStatus/icon?job=Docker-Builders/x86-64/x86-64-heimdall)](https://ci.linuxserver.io/job/Docker-Builders/job/x86-64/job/x86-64-heimdall/)
+
+Heimdall is a way to organise all those links to your most used web sites and web applications in a simple way.
+
+Simplicity is the key to Heimdall.
+
+Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.
+
+[![nginx](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/nginx-banner.png)][appurl]
+
+## Usage
+
+```
+docker create \
+--name=heimdall \
+-v <path to data>:/config \
+-e PGID=<gid> -e PUID=<uid>  \
+-p 80:80 -p 443:443 \
+-e TZ=<timezone> \
+linuxserver/heimdall
+```
+
+## 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 80` - The web-services.
+* `-p 443` - The SSL-Based Webservice
+* `-v /config` - Contains your www content and all relevant configuration files.
+* `-e PGID` for GroupID - see below for explanation
+* `-e PUID` for UserID - see below for explanation
+* `-e TZ` - timezone ie. `America/New_York`
+* `-e BASEURL` - _optional_ - you can set a base url through this variable to serve the app at http://SERVERIP:PORT/BASEURL
+
+It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it heimdall /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 web gui at http://SERVERIP:PORT
+
+## Info
+
+* To monitor the logs of the container in realtime `docker logs -f heimdall`.
+
+
+* container version number 
+
+`docker inspect -f '{{ index .Config.Labels "build_version" }}' heimdall`
+
+* image version number
+
+`docker inspect -f '{{ index .Config.Labels "build_version" }}' linuxserver/heimdall`
+
+## Versions
+
++ **XX.02.18:** Intial Release.

root/defaults/default

@@ -3,7 +3,7 @@ server {
 
 	listen 443 ssl;
 
-	root /app/root;
+	root /var/www/localhost/heimdall/public;
 	index index.php index.html index.htm;
 
 	server_name _;

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

@@ -4,27 +4,20 @@
 mkdir -p \
   /config/www/{backgrounds,icons}
 
-# set base url if needed
-rm -rf /app/root
-if [ -z "$BASEURL" ]; then
-  echo "No base url set. You can access the app at http://SERVERIP:PORT"
-  ln -s ./heimdall/public /app/root
-else
-  echo "Setting base url. You can access the app at http://SERVERIP:PORT/$BASEURL"
-  mkdir -p /app/root
-  ln -s ../heimdall/public /app/root/"$BASEURL"
-fi
-
 # symlink user config
-rm -rf \
-  /app/heimdall/storage/app/public/backgrounds \
-  /app/heimdall/storage/app/public/icons \
-  /app/heimdall/database/app.sqlite
-ln -s /config/www/backgrounds /app/heimdall/storage/app/public/backgrounds
-ln -s /config/www/icons /app/heimdall/storage/app/public/icons
-ln -s /config/www/app.sqlite /app/heimdall/database/app.sqlite
+
+symlinks=( \
+/var/www/localhost/heimdall/storage/app/public/backgrounds \
+/var/www/localhost/heimdall/storage/app/public/icons \
+/var/www/localhost/heimdall/database/app.sqlite )
+
+for i in "${symlinks[@]}"
+do
+[[ -e "$i" && ! -L "$i" ]] && rm -rf "$i"
+[[ ! -L "$i" ]] && ln -s /config/www/"$(basename "$i")" "$i"
+done
 
 # permissions
 chown -R abc:abc \
 	/config \
-	/app
+	/var/www/localhost/heimdall