From dcb82e63c4114b71eb4e6ace3a8f84585af5fcbe Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 7 Feb 2018 16:16:24 -0500 Subject: [PATCH 1/7] remove baseurl config --- root/etc/cont-init.d/50-config | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 48b75b9..8165063 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -4,17 +4,6 @@ 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 symlinks=( \ From eb5710279aa3cd40cfbc827218446a74cd252b86 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 7 Feb 2018 16:19:10 -0500 Subject: [PATCH 2/7] change www location --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9f532e..be3c1c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ RUN \ php7-pdo_sqlite \ php7-tokenizer \ tar && \ - mkdir -p /app/heimdall && \ + mkdir -p /var/www/localhost/heimdall && \ VERSION="$(curl -sX GET https://api.github.com/repos/linuxserver/Heimdall/releases/latest | grep 'tag_name' | cut -d\" -f4)" && \ echo "**Installing Heimdall ${VERSION}**" && \ curl -o \ @@ -26,7 +26,7 @@ RUN \ tar xf \ /tmp/heimdall.tar.gz -C \ /tmp && \ - cp -R /tmp/Heimdall-*/* /app/heimdall/ && \ + cp -R /tmp/Heimdall-*/* /var/www/localhost/heimdall/ && \ echo "** cleanup **" && \ rm -rf \ /tmp/* From f8313f706d92ab3662adbd5c9bacd8ec55dc23f7 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 7 Feb 2018 16:19:52 -0500 Subject: [PATCH 3/7] change root location --- root/defaults/default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/default b/root/defaults/default index aa5f624..ae5fb57 100644 --- 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 _; From 275aa05c17ecff5dce32b656a513338171aa1238 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 7 Feb 2018 16:21:32 -0500 Subject: [PATCH 4/7] update www location --- root/etc/cont-init.d/50-config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 8165063..3fd545e 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -7,9 +7,9 @@ mkdir -p \ # symlink user config symlinks=( \ -/app/heimdall/storage/app/public/backgrounds \ -/app/heimdall/storage/app/public/icons \ -/app/heimdall/database/app.sqlite ) +/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 From 3fe99250641a6356e183f6bc54acb41b5088ea29 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 7 Feb 2018 16:23:02 -0500 Subject: [PATCH 5/7] fix www permissions --- root/etc/cont-init.d/50-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 3fd545e..1564f49 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -20,4 +20,4 @@ done # permissions chown -R abc:abc \ /config \ - /app + /var/www/localhost/heimdall From b570e58958302404a7560c10e4b53a1280b58d80 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Wed, 7 Feb 2018 21:26:20 +0000 Subject: [PATCH 6/7] some tidying remove unneeded copy --- Dockerfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index be3c1c8..c7f8ee2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,19 +17,20 @@ RUN \ php7-pdo_sqlite \ php7-tokenizer \ tar && \ - mkdir -p /var/www/localhost/heimdall && \ + echo "**** install heimdall ****" && \ VERSION="$(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 \ - "https://github.com/linuxserver/Heimdall/archive/${VERSION}.tar.gz" && \ + /tmp/heimdall.tar.gz -L \ + "https://github.com/linuxserver/Heimdall/archive/${VERSION}.tar.gz" && \ tar xf \ - /tmp/heimdall.tar.gz -C \ - /tmp && \ - cp -R /tmp/Heimdall-*/* /var/www/localhost/heimdall/ && \ + /tmp/heimdall.tar.gz -C \ + /var/www/localhost/heimdall --strip-components=1 && \ echo "** cleanup **" && \ rm -rf \ - /tmp/* + /tmp/* # add local files COPY root/ / From 8df0c563963c44cc663f9ee945ede0be26606b6f Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Wed, 7 Feb 2018 21:28:00 +0000 Subject: [PATCH 7/7] some tidying remove unneeded copy --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c7f8ee2..2fa2552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,6 @@ RUN \ tar && \ echo "**** install heimdall ****" && \ VERSION="$(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 \