mirror of
https://github.com/linuxserver/docker-heimdall.git
synced 2026-04-19 08:05:48 +09:00
Compare commits
9 Commits
1.4.17-pkg
...
2.0.3-pkg-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0eb310aa07 | ||
|
|
536409cf5f | ||
|
|
3f642a6dc8 | ||
|
|
270d9753f7 | ||
|
|
b0ee245e54 | ||
|
|
6e17ad1836 | ||
|
|
db4c2697b6 | ||
|
|
8a288bbef9 | ||
|
|
a310917220 |
@@ -31,6 +31,9 @@ RUN \
|
|||||||
tar xf \
|
tar xf \
|
||||||
/tmp/heimdall.tar.gz -C \
|
/tmp/heimdall.tar.gz -C \
|
||||||
/var/www/localhost/heimdall --strip-components=1 && \
|
/var/www/localhost/heimdall --strip-components=1 && \
|
||||||
|
echo "**** configure nginx ****" && \
|
||||||
|
echo -e '\n# Heimdall user authorization\nfastcgi_param PHP_AUTH_USER $remote_user;\nfastcgi_param PHP_AUTH_PW $http_authorization;' >> \
|
||||||
|
/etc/nginx/fastcgi_params && \
|
||||||
echo "**** cleanup ****" && \
|
echo "**** cleanup ****" && \
|
||||||
rm -rf \
|
rm -rf \
|
||||||
/tmp/*
|
/tmp/*
|
||||||
|
|||||||
@@ -34,6 +34,9 @@ RUN \
|
|||||||
tar xf \
|
tar xf \
|
||||||
/tmp/heimdall.tar.gz -C \
|
/tmp/heimdall.tar.gz -C \
|
||||||
/var/www/localhost/heimdall --strip-components=1 && \
|
/var/www/localhost/heimdall --strip-components=1 && \
|
||||||
|
echo "**** configure nginx ****" && \
|
||||||
|
echo -e '\n# Heimdall user authorization\nfastcgi_param PHP_AUTH_USER $remote_user;\nfastcgi_param PHP_AUTH_PW $http_authorization;' >> \
|
||||||
|
/etc/nginx/fastcgi_params && \
|
||||||
echo "**** cleanup ****" && \
|
echo "**** cleanup ****" && \
|
||||||
rm -rf \
|
rm -rf \
|
||||||
/tmp/*
|
/tmp/*
|
||||||
|
|||||||
@@ -34,6 +34,9 @@ RUN \
|
|||||||
tar xf \
|
tar xf \
|
||||||
/tmp/heimdall.tar.gz -C \
|
/tmp/heimdall.tar.gz -C \
|
||||||
/var/www/localhost/heimdall --strip-components=1 && \
|
/var/www/localhost/heimdall --strip-components=1 && \
|
||||||
|
echo "**** configure nginx ****" && \
|
||||||
|
echo -e '\n# Heimdall user authorization\nfastcgi_param PHP_AUTH_USER $remote_user;\nfastcgi_param PHP_AUTH_PW $http_authorization;' >> \
|
||||||
|
/etc/nginx/fastcgi_params && \
|
||||||
echo "**** cleanup ****" && \
|
echo "**** cleanup ****" && \
|
||||||
rm -rf \
|
rm -rf \
|
||||||
/tmp/*
|
/tmp/*
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ Find us at:
|
|||||||
* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
|
* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
|
||||||
* [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord.
|
* [IRC](https://irc.linuxserver.io) - on freenode at `#linuxserver.io`. Our primary support channel is Discord.
|
||||||
* [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
|
* [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
|
||||||
* [Podcast](https://podcast.linuxserver.io) - on hiatus. Coming back soon (late 2018).
|
* [Podcast](https://anchor.fm/linuxserverio) - on hiatus. Coming back soon (late 2018).
|
||||||
|
|
||||||
# PSA: Changes are happening
|
# PSA: Changes are happening
|
||||||
|
|
||||||
@@ -136,6 +136,9 @@ This image now supports password protection through htpasswd. Run the following
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **31.10.18:** - Add queue service.
|
||||||
|
* **17.10.18:** - Symlink avatars folder.
|
||||||
|
* **16.10.18:** - Updated fastcgi_params for user login support.
|
||||||
* **07.10.18:** - Symlink `.env` rather than copy. It now resides under `/config/www`
|
* **07.10.18:** - Symlink `.env` rather than copy. It now resides under `/config/www`
|
||||||
* **30.09.18:** - Multi-arch image. Move `.env` to `/config`.
|
* **30.09.18:** - Multi-arch image. Move `.env` to `/config`.
|
||||||
* **05.09.18:** - Rebase to alpine linux 3.8.
|
* **05.09.18:** - Rebase to alpine linux 3.8.
|
||||||
|
|||||||
@@ -47,6 +47,9 @@ app_setup_block: |
|
|||||||
|
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- { date: "31.10.18:", desc: "Add queue service." }
|
||||||
|
- { date: "17.10.18:", desc: "Symlink avatars folder." }
|
||||||
|
- { date: "16.10.18:", desc: "Updated fastcgi_params for user login support." }
|
||||||
- { date: "07.10.18:", desc: "Symlink `.env` rather than copy. It now resides under `/config/www`" }
|
- { date: "07.10.18:", desc: "Symlink `.env` rather than copy. It now resides under `/config/www`" }
|
||||||
- { date: "30.09.18:", desc: "Multi-arch image. Move `.env` to `/config`." }
|
- { date: "30.09.18:", desc: "Multi-arch image. Move `.env` to `/config`." }
|
||||||
- { date: "05.09.18:", desc: "Rebase to alpine linux 3.8." }
|
- { date: "05.09.18:", desc: "Rebase to alpine linux 3.8." }
|
||||||
|
|||||||
@@ -2,15 +2,18 @@
|
|||||||
|
|
||||||
# make our folders
|
# make our folders
|
||||||
mkdir -p \
|
mkdir -p \
|
||||||
/config/www/{backgrounds,icons}
|
/config/www/{backgrounds,icons,avatars}
|
||||||
|
|
||||||
# copy .env if not exists
|
# copy .env if not exists
|
||||||
[[ ! -f /config/www/.env ]] && \
|
[[ ! -f /config/www/.env ]] && \
|
||||||
cp /var/www/localhost/heimdall/.env /config/www/.env
|
cp /var/www/localhost/heimdall/.env /config/www/.env
|
||||||
|
# set queue driver to database
|
||||||
|
sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env
|
||||||
|
|
||||||
# create symlinks
|
# create symlinks
|
||||||
|
|
||||||
symlinks=( \
|
symlinks=( \
|
||||||
|
/var/www/localhost/heimdall/storage/app/public/avatars \
|
||||||
/var/www/localhost/heimdall/storage/app/public/backgrounds \
|
/var/www/localhost/heimdall/storage/app/public/backgrounds \
|
||||||
/var/www/localhost/heimdall/storage/app/public/icons \
|
/var/www/localhost/heimdall/storage/app/public/icons \
|
||||||
/var/www/localhost/heimdall/database/app.sqlite \
|
/var/www/localhost/heimdall/database/app.sqlite \
|
||||||
|
|||||||
4
root/etc/services.d/queue/run
Normal file
4
root/etc/services.d/queue/run
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
#!/usr/bin/with-contenv bash
|
||||||
|
|
||||||
|
exec \
|
||||||
|
s6-setuidgid abc php /var/www/localhost/heimdall/artisan queue:work database --sleep=3 --tries=3
|
||||||
Reference in New Issue
Block a user