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

Merge pull request #3 from linuxserver/rm_baseurl
Remove baseurl, change www location
2026-02-22 20:30:31 +09:00 · 2018-02-09 11:58:04 +00:00 · 2018-02-08 08:13:24 +00:00 · 2018-02-07 21:28:00 +00:00 · 2018-02-07 21:26:20 +00:00 · 2018-02-07 16:23:02 -05:00
3 changed files with 22 additions and 29 deletions
--- a/18
+++ b/18
@@ -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/ /
--- a/root/defaults/default
+++ b/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 _;
--- a/root/etc/cont-init.d/50-config
+++ b/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
Author	SHA1	Message	Date
sparklyballs	21ce2cff95	use HEIM_VER in place of VERSION to avoid confusion with env var	2018-02-09 11:58:04 +00:00
sparklyballs	cd50025f67	Merge pull request #3 from linuxserver/rm_baseurl Remove baseurl, change www location	2018-02-08 08:13:24 +00:00
sparklyballs	8df0c56396	some tidying remove unneeded copy	2018-02-07 21:28:00 +00:00
sparklyballs	b570e58958	some tidying remove unneeded copy	2018-02-07 21:26:20 +00:00
aptalca	3fe9925064	fix www permissions	2018-02-07 16:23:02 -05:00
aptalca	275aa05c17	update www location	2018-02-07 16:21:32 -05:00
aptalca	f8313f706d	change root location	2018-02-07 16:19:52 -05:00
aptalca	eb5710279a	change www location	2018-02-07 16:19:10 -05:00
aptalca	dcb82e63c4	remove baseurl config	2018-02-07 16:16:24 -05:00
sparklyballs	f0fb1690eb	Merge pull request #1 from linuxserver/symlinks_ugh Symlinks ugh	2018-02-07 19:56:08 +00:00
sparklyballs	61aecdb033	add logic for non-existant link and file not existing either	2018-02-07 16:47:02 +00:00
sparklyballs	458ed75332	shellchecking	2018-02-07 16:21:04 +00:00
sparklyballs	21cca50992	use loop for symlinks and only make if they don't exist	2018-02-07 16:17:00 +00:00