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

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 \
+symlinks=( \
-  /app/heimdall/storage/app/public/icons \
+/var/www/localhost/heimdall/storage/app/public/backgrounds \
-  /app/heimdall/database/app.sqlite
+/var/www/localhost/heimdall/storage/app/public/icons \
-ln -s /config/www/backgrounds /app/heimdall/storage/app/public/backgrounds
+/var/www/localhost/heimdall/database/app.sqlite )
-ln -s /config/www/icons /app/heimdall/storage/app/public/icons
+
-ln -s /config/www/app.sqlite /app/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