linuxserver/docker-heimdall
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-heimdall.git synced 2025-10-27 11:13:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from linuxserver/rm_baseurl

Browse Source 
Remove baseurl, change www location
This commit is contained in:
sparklyballs
2018-02-08 08:13:24 +00:00
committed by GitHub
parent f0fb1690eb 8df0c56396
commit cd50025f67
3 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Dockerfile
View File

@@ -17,19 +17,19 @@ RUN \
php7-pdo_sqlite \ php7-pdo_sqlite \
php7-tokenizer \ php7-tokenizer \
tar && \ 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)" && \ 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 \ 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/${VERSION}.tar.gz" && \
tar xf \ 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 **" && \ echo "** cleanup **" && \
rm -rf \ rm -rf \
/tmp/* /tmp/*
# add local files # add local files
COPY root/ / COPY root/ /

2
root/defaults/default
View File

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

19
root/etc/cont-init.d/50-config
View File

@@ -4,23 +4,12 @@
mkdir -p \ mkdir -p \
/config/www/{backgrounds,icons} /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 # symlink user config
symlinks=( \ symlinks=( \
/app/heimdall/storage/app/public/backgrounds \ /var/www/localhost/heimdall/storage/app/public/backgrounds \
/app/heimdall/storage/app/public/icons \ /var/www/localhost/heimdall/storage/app/public/icons \
/app/heimdall/database/app.sqlite ) /var/www/localhost/heimdall/database/app.sqlite )
for i in "${symlinks[@]}" for i in "${symlinks[@]}"
do do
@@ -31,4 +20,4 @@ done
# permissions # permissions
chown -R abc:abc \ chown -R abc:abc \
/config \ /config \
/app /var/www/localhost/heimdall