Compare commits

...

21 Commits
1 ... 21

Author SHA1 Message Date
sparklyballs
78ecdea6d6 Merge pull request #4 from linuxserver/release
Release
2018-02-12 15:22:08 +00:00
aptalca
f030577f75 Fix typo 2018-02-12 08:21:34 -05:00
aptalca
992949bd7c Update README.md 2018-02-12 08:17:13 -05:00
aptalca
b34b1691f4 Update README.md 2018-02-12 08:16:31 -05:00
aptalca
9386537608 Rename READMETEMPLATE.md to README.md 2018-02-11 10:20:36 -05:00
aptalca
3ed22863f7 Delete README.md 2018-02-11 10:20:17 -05:00
aptalca
b357db7900 Update READMETEMPLATE.md 2018-02-11 10:20:01 -05:00
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
41fd08cadb not released yet use in progress README 2018-02-07 16:28:40 +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
4 changed files with 25 additions and 33 deletions

View File

@@ -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/ /

View File

@@ -13,7 +13,7 @@ The [LinuxServer.io][linuxserverurl] team brings you another container release f
* [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/)
[![](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.
@@ -21,7 +21,7 @@ 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]
[![heimdall](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/heimdall-banner.png)][appurl]
## Usage
@@ -49,7 +49,6 @@ http://192.168.x.x:8080 would show you what's running INSIDE the container on po
* `-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`.
@@ -83,4 +82,4 @@ Access the web gui at http://SERVERIP:PORT
## Versions
+ **XX.02.18:** Intial Release.
+ **12.02.18:** Initial Release.

View File

@@ -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 _;

View File

@@ -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