mirror of
https://github.com/linuxserver/docker-heimdall.git
synced 2026-04-11 21:28:07 +09:00
Compare commits
13 Commits
2.2.0-ls46
...
2.2.2-ls55
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d1fb1fdb0d | ||
|
|
85a6be7169 | ||
|
|
459218f07f | ||
|
|
d7840dc802 | ||
|
|
ab62b2269e | ||
|
|
b3e5cb11cb | ||
|
|
42468518a5 | ||
|
|
f6abce49b8 | ||
|
|
aaf40620c5 | ||
|
|
a03a8da188 | ||
|
|
4138ee793e | ||
|
|
b6825c8911 | ||
|
|
45d80c2217 |
@@ -1,4 +1,4 @@
|
|||||||
FROM lsiobase/nginx:3.9
|
FROM lsiobase/nginx:3.10
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM lsiobase/nginx:arm64v8-3.9
|
FROM lsiobase/nginx:arm64v8-3.10
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM lsiobase/nginx:arm32v7-3.9
|
FROM lsiobase/nginx:arm32v7-3.10
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
|||||||
@@ -171,6 +171,9 @@ Below are the instructions for updating containers:
|
|||||||
containrrr/watchtower \
|
containrrr/watchtower \
|
||||||
--run-once heimdall
|
--run-once heimdall
|
||||||
```
|
```
|
||||||
|
|
||||||
|
**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using Docker Compose.
|
||||||
|
|
||||||
* You can also remove the old dangling images: `docker image prune`
|
* You can also remove the old dangling images: `docker image prune`
|
||||||
|
|
||||||
## Building locally
|
## Building locally
|
||||||
@@ -194,6 +197,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **16.07.19:** - Save laravel.log to /config/log/heimdall.
|
||||||
|
* **28.06.19:** - Rebasing to alpine 3.10.
|
||||||
* **01.04.19:** - Fix permission detect logic.
|
* **01.04.19:** - Fix permission detect logic.
|
||||||
* **26.03.19:** - Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown.
|
* **26.03.19:** - Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown.
|
||||||
* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
|
* **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
|
||||||
|
|||||||
@@ -1,67 +1,67 @@
|
|||||||
alpine-baselayout-3.1.0-r3
|
alpine-baselayout-3.1.2-r0
|
||||||
alpine-keys-2.1-r1
|
alpine-keys-2.1-r2
|
||||||
apache2-utils-2.4.39-r0
|
apache2-utils-2.4.39-r0
|
||||||
apk-tools-2.10.3-r1
|
apk-tools-2.10.4-r2
|
||||||
apr-1.6.5-r0
|
apr-1.6.5-r0
|
||||||
apr-util-1.6.1-r5
|
apr-util-1.6.1-r6
|
||||||
bash-4.4.19-r1
|
argon2-libs-20171227-r2
|
||||||
busybox-1.29.3-r10
|
bash-5.0.0-r0
|
||||||
|
busybox-1.30.1-r2
|
||||||
ca-certificates-20190108-r0
|
ca-certificates-20190108-r0
|
||||||
ca-certificates-cacert-20190108-r0
|
ca-certificates-cacert-20190108-r0
|
||||||
coreutils-8.30-r0
|
coreutils-8.31-r0
|
||||||
curl-7.64.0-r2
|
curl-7.65.1-r0
|
||||||
expat-2.2.6-r0
|
expat-2.2.7-r0
|
||||||
git-2.20.1-r0
|
git-2.22.0-r0
|
||||||
libacl-2.2.52-r5
|
libacl-2.2.52-r6
|
||||||
libattr-2.4.47-r7
|
libattr-2.4.48-r0
|
||||||
libc-utils-0.7.1-r0
|
libc-utils-0.7.1-r0
|
||||||
libcrypto1.1-1.1.1b-r1
|
libcrypto1.1-1.1.1c-r0
|
||||||
libcurl-7.64.0-r2
|
libcurl-7.65.1-r0
|
||||||
libedit-20181209.3.1-r0
|
libedit-20190324.3.1-r0
|
||||||
libmagic-5.36-r0
|
libmagic-5.37-r0
|
||||||
libressl2.7-libcrypto-2.7.5-r0
|
libressl2.7-libcrypto-2.7.5-r0
|
||||||
libressl2.7-libssl-2.7.5-r0
|
libressl2.7-libssl-2.7.5-r0
|
||||||
libssh2-1.8.2-r0
|
libssl1.1-1.1.1c-r0
|
||||||
libssl1.1-1.1.1b-r1
|
libtls-standalone-2.9.1-r0
|
||||||
libtls-standalone-2.7.4-r6
|
libuuid-2.33.2-r0
|
||||||
libuuid-2.33-r0
|
libxml2-2.9.9-r2
|
||||||
libxml2-2.9.9-r1
|
libzip-1.5.2-r0
|
||||||
libzip-1.5.1-r2
|
linux-pam-1.3.0-r1
|
||||||
linux-pam-1.3.0-r0
|
|
||||||
logrotate-3.15.0-r0
|
logrotate-3.15.0-r0
|
||||||
musl-1.1.20-r4
|
musl-1.1.22-r3
|
||||||
musl-utils-1.1.20-r4
|
musl-utils-1.1.22-r3
|
||||||
nano-3.2-r0
|
nano-4.3-r0
|
||||||
ncurses-libs-6.1_p20190105-r0
|
ncurses-libs-6.1_p20190518-r0
|
||||||
ncurses-terminfo-6.1_p20190105-r0
|
ncurses-terminfo-6.1_p20190518-r0
|
||||||
ncurses-terminfo-base-6.1_p20190105-r0
|
ncurses-terminfo-base-6.1_p20190518-r0
|
||||||
nghttp2-libs-1.35.1-r0
|
nghttp2-libs-1.39.2-r0
|
||||||
nginx-1.14.2-r1
|
nginx-1.16.1-r0
|
||||||
openssl-1.1.1b-r1
|
openssl-1.1.1c-r0
|
||||||
pcre-8.42-r1
|
pcre-8.43-r0
|
||||||
pcre2-10.32-r1
|
pcre2-10.33-r0
|
||||||
php7-7.2.18-r0
|
php7-7.3.8-r0
|
||||||
php7-common-7.2.19-r0
|
php7-common-7.3.9-r0
|
||||||
php7-ctype-7.2.19-r0
|
php7-ctype-7.3.9-r0
|
||||||
php7-fileinfo-7.2.18-r0
|
php7-fileinfo-7.3.8-r0
|
||||||
php7-fpm-7.2.18-r0
|
php7-fpm-7.3.8-r0
|
||||||
php7-json-7.2.18-r0
|
php7-json-7.3.8-r0
|
||||||
php7-mbstring-7.2.18-r0
|
php7-mbstring-7.3.8-r0
|
||||||
php7-openssl-7.2.18-r0
|
php7-openssl-7.3.8-r0
|
||||||
php7-pdo-7.2.19-r0
|
php7-pdo-7.3.9-r0
|
||||||
php7-pdo_sqlite-7.2.19-r0
|
php7-pdo_sqlite-7.3.9-r0
|
||||||
php7-session-7.2.18-r0
|
php7-session-7.3.8-r0
|
||||||
php7-simplexml-7.2.18-r0
|
php7-simplexml-7.3.8-r0
|
||||||
php7-tokenizer-7.2.19-r0
|
php7-tokenizer-7.3.9-r0
|
||||||
php7-xml-7.2.18-r0
|
php7-xml-7.3.8-r0
|
||||||
php7-xmlwriter-7.2.18-r0
|
php7-xmlwriter-7.3.8-r0
|
||||||
php7-zip-7.2.19-r0
|
php7-zip-7.3.9-r0
|
||||||
popt-1.16-r7
|
popt-1.16-r7
|
||||||
readline-7.0.003-r1
|
readline-8.0.0-r0
|
||||||
scanelf-1.2.3-r0
|
scanelf-1.2.3-r0
|
||||||
shadow-4.5-r2
|
shadow-4.6-r2
|
||||||
sqlite-libs-3.28.0-r0
|
sqlite-libs-3.28.0-r0
|
||||||
ssl_client-1.29.3-r10
|
ssl_client-1.30.1-r2
|
||||||
tar-1.32-r0
|
tar-1.32-r0
|
||||||
tzdata-2019a-r0
|
tzdata-2019a-r0
|
||||||
xz-5.2.4-r0
|
xz-5.2.4-r0
|
||||||
|
|||||||
@@ -49,6 +49,8 @@ app_setup_block: |
|
|||||||
|
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- { date: "16.07.19:", desc: "Save laravel.log to /config/log/heimdall." }
|
||||||
|
- { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
|
||||||
- { date: "01.04.19:", desc: "Fix permission detect logic." }
|
- { date: "01.04.19:", desc: "Fix permission detect logic." }
|
||||||
- { date: "26.03.19:", desc: "Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown." }
|
- { date: "26.03.19:", desc: "Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown." }
|
||||||
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
|
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
|
||||||
|
|||||||
@@ -3,7 +3,8 @@
|
|||||||
# make our folders
|
# make our folders
|
||||||
mkdir -p \
|
mkdir -p \
|
||||||
/config/www/{backgrounds,icons,avatars,SupportedApps} \
|
/config/www/{backgrounds,icons,avatars,SupportedApps} \
|
||||||
/var/www/localhost/heimdall
|
/var/www/localhost/heimdall \
|
||||||
|
/config/log/heimdall
|
||||||
|
|
||||||
# install heimdall if necessary
|
# install heimdall if necessary
|
||||||
[[ -f /heimdall/heimdall.tar.gz ]] && \
|
[[ -f /heimdall/heimdall.tar.gz ]] && \
|
||||||
@@ -32,6 +33,11 @@ do
|
|||||||
[[ ! -L "$i" ]] && ln -s /config/www/"$(basename "$i")" "$i"
|
[[ ! -L "$i" ]] && ln -s /config/www/"$(basename "$i")" "$i"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
[[ -e "/var/www/localhost/heimdall/storage/logs/laravel.log" && ! -L "/var/www/localhost/heimdall/storage/logs/laravel.log" ]] \
|
||||||
|
&& rm -rf "/var/www/localhost/heimdall/storage/logs/laravel.log"
|
||||||
|
[[ ! -L "/var/www/localhost/heimdall/storage/logs/laravel.log" ]] && \
|
||||||
|
ln -s "/config/log/heimdall/laravel.log" "/var/www/localhost/heimdall/storage/logs/laravel.log"
|
||||||
|
|
||||||
# copy .env if not exists
|
# copy .env if not exists
|
||||||
[[ ! -f /config/www/.env ]] && \
|
[[ ! -f /config/www/.env ]] && \
|
||||||
cp /var/www/localhost/heimdall/.env.example /config/www/.env && \
|
cp /var/www/localhost/heimdall/.env.example /config/www/.env && \
|
||||||
|
|||||||
9
root/etc/logrotate.d/heimdall
Normal file
9
root/etc/logrotate.d/heimdall
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
/config/log/heimdall/laravel.log {
|
||||||
|
size 5M
|
||||||
|
rotate 5
|
||||||
|
compress
|
||||||
|
nodateext
|
||||||
|
notifempty
|
||||||
|
missingok
|
||||||
|
su abc abc
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user