mirror of
https://github.com/linuxserver/docker-heimdall.git
synced 2026-04-14 22:32:27 +09:00
Compare commits
5 Commits
developmen
...
developmen
| Author | SHA1 | Date | |
|---|---|---|---|
|
c5693232f4 | ||
|
|
6d7fad2d98 | ||
|
204bad5de9 | ||
|
|
3779275528 | ||
|
|
c4ab19e354 |
@@ -242,6 +242,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **13.04.23:** - Move ssl.conf include to default.conf.
|
||||||
* **20.01.23:** - Rebase to alpine 3.17 with php8.1.
|
* **20.01.23:** - Rebase to alpine 3.17 with php8.1.
|
||||||
* **14.11.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
|
* **14.11.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
|
||||||
* **04.11.22:** - Build commits to upstream branch 2.x.
|
* **04.11.22:** - Build commits to upstream branch 2.x.
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ alpine-baselayout 3.4.0-r0 apk
|
|||||||
alpine-baselayout-data 3.4.0-r0 apk
|
alpine-baselayout-data 3.4.0-r0 apk
|
||||||
alpine-keys 2.4-r1 apk
|
alpine-keys 2.4-r1 apk
|
||||||
alpine-release 3.17.3-r0 apk
|
alpine-release 3.17.3-r0 apk
|
||||||
apache2-utils 2.4.56-r0 apk
|
apache2-utils 2.4.57-r0 apk
|
||||||
apk-tools 2.12.10-r1 apk
|
apk-tools 2.12.10-r1 apk
|
||||||
apr 1.7.2-r0 apk
|
apr 1.7.2-r0 apk
|
||||||
apr-util 1.6.3-r0 apk
|
apr-util 1.6.3-r0 apk
|
||||||
@@ -21,7 +21,7 @@ ca-certificates-bundle 20220614-r4 apk
|
|||||||
clue/stream-filter v1.6.0 php-composer
|
clue/stream-filter v1.6.0 php-composer
|
||||||
composer/pcre 3.1.0 php-composer
|
composer/pcre 3.1.0 php-composer
|
||||||
coreutils 9.1-r0 apk
|
coreutils 9.1-r0 apk
|
||||||
curl 7.88.1-r1 apk
|
curl 8.0.1-r0 apk
|
||||||
dflydev/dot-access-data v3.0.2 php-composer
|
dflydev/dot-access-data v3.0.2 php-composer
|
||||||
doctrine/cache 2.2.0 php-composer
|
doctrine/cache 2.2.0 php-composer
|
||||||
doctrine/dbal 3.5.1 php-composer
|
doctrine/dbal 3.5.1 php-composer
|
||||||
@@ -65,8 +65,8 @@ libattr 2.5.1-r2 apk
|
|||||||
libbsd 0.11.7-r0 apk
|
libbsd 0.11.7-r0 apk
|
||||||
libbz2 1.0.8-r4 apk
|
libbz2 1.0.8-r4 apk
|
||||||
libc-utils 0.7.2-r3 apk
|
libc-utils 0.7.2-r3 apk
|
||||||
libcrypto3 3.0.8-r3 apk
|
libcrypto3 3.0.8-r4 apk
|
||||||
libcurl 7.88.1-r1 apk
|
libcurl 8.0.1-r0 apk
|
||||||
libedit 20221030.3.1-r0 apk
|
libedit 20221030.3.1-r0 apk
|
||||||
libexpat 2.5.0-r0 apk
|
libexpat 2.5.0-r0 apk
|
||||||
libgcc 12.2.1_git20220924-r4 apk
|
libgcc 12.2.1_git20220924-r4 apk
|
||||||
@@ -74,10 +74,10 @@ libintl 0.21.1-r1 apk
|
|||||||
libmd 1.0.4-r0 apk
|
libmd 1.0.4-r0 apk
|
||||||
libpq 15.2-r0 apk
|
libpq 15.2-r0 apk
|
||||||
libproc 3.3.17-r2 apk
|
libproc 3.3.17-r2 apk
|
||||||
libssl3 3.0.8-r3 apk
|
libssl3 3.0.8-r4 apk
|
||||||
libstdc++ 12.2.1_git20220924-r4 apk
|
libstdc++ 12.2.1_git20220924-r4 apk
|
||||||
libuuid 2.38.1-r1 apk
|
libuuid 2.38.1-r1 apk
|
||||||
libxml2 2.10.3-r1 apk
|
libxml2 2.10.4-r0 apk
|
||||||
libzip 1.9.2-r2 apk
|
libzip 1.9.2-r2 apk
|
||||||
linux-pam 1.5.2-r1 apk
|
linux-pam 1.5.2-r1 apk
|
||||||
logrotate 3.20.1-r3 apk
|
logrotate 3.20.1-r3 apk
|
||||||
@@ -98,14 +98,14 @@ nginx 1.22.1-r0 apk
|
|||||||
nikic/php-parser v4.15.2 php-composer
|
nikic/php-parser v4.15.2 php-composer
|
||||||
nunomaduro/collision v5.11.0 php-composer
|
nunomaduro/collision v5.11.0 php-composer
|
||||||
oniguruma 6.9.8-r0 apk
|
oniguruma 6.9.8-r0 apk
|
||||||
openssl 3.0.8-r3 apk
|
openssl 3.0.8-r4 apk
|
||||||
opis/closure 3.6.3 php-composer
|
opis/closure 3.6.3 php-composer
|
||||||
pcre 8.45-r2 apk
|
pcre 8.45-r2 apk
|
||||||
pcre2 10.42-r0 apk
|
pcre2 10.42-r0 apk
|
||||||
phar-io/manifest 2.0.3 php-composer
|
phar-io/manifest 2.0.3 php-composer
|
||||||
phar-io/version 3.2.1 php-composer
|
phar-io/version 3.2.1 php-composer
|
||||||
php-cli 8.1.17 binary
|
php-cli 8.1.18 binary
|
||||||
php-fpm 8.1.17 binary
|
php-fpm 8.1.18 binary
|
||||||
php-http/cache-plugin 1.7.5 php-composer
|
php-http/cache-plugin 1.7.5 php-composer
|
||||||
php-http/client-common 2.6.0 php-composer
|
php-http/client-common 2.6.0 php-composer
|
||||||
php-http/discovery 1.14.3 php-composer
|
php-http/discovery 1.14.3 php-composer
|
||||||
@@ -114,26 +114,26 @@ php-http/message 1.13.0 php-composer
|
|||||||
php-http/message-factory v1.0.2 php-composer
|
php-http/message-factory v1.0.2 php-composer
|
||||||
php-http/multipart-stream-builder 1.2.0 php-composer
|
php-http/multipart-stream-builder 1.2.0 php-composer
|
||||||
php-http/promise 1.1.0 php-composer
|
php-http/promise 1.1.0 php-composer
|
||||||
php81 8.1.17-r0 apk
|
php81 8.1.18-r0 apk
|
||||||
php81-common 8.1.17-r0 apk
|
php81-common 8.1.18-r0 apk
|
||||||
php81-ctype 8.1.17-r0 apk
|
php81-ctype 8.1.18-r0 apk
|
||||||
php81-curl 8.1.17-r0 apk
|
php81-curl 8.1.18-r0 apk
|
||||||
php81-fileinfo 8.1.17-r0 apk
|
php81-fileinfo 8.1.18-r0 apk
|
||||||
php81-fpm 8.1.17-r0 apk
|
php81-fpm 8.1.18-r0 apk
|
||||||
php81-intl 8.1.17-r0 apk
|
php81-intl 8.1.18-r0 apk
|
||||||
php81-mbstring 8.1.17-r0 apk
|
php81-mbstring 8.1.18-r0 apk
|
||||||
php81-mysqlnd 8.1.17-r0 apk
|
php81-mysqlnd 8.1.18-r0 apk
|
||||||
php81-openssl 8.1.17-r0 apk
|
php81-openssl 8.1.18-r0 apk
|
||||||
php81-pdo 8.1.17-r0 apk
|
php81-pdo 8.1.18-r0 apk
|
||||||
php81-pdo_mysql 8.1.17-r0 apk
|
php81-pdo_mysql 8.1.18-r0 apk
|
||||||
php81-pdo_pgsql 8.1.17-r0 apk
|
php81-pdo_pgsql 8.1.18-r0 apk
|
||||||
php81-pdo_sqlite 8.1.17-r0 apk
|
php81-pdo_sqlite 8.1.18-r0 apk
|
||||||
php81-session 8.1.17-r0 apk
|
php81-session 8.1.18-r0 apk
|
||||||
php81-simplexml 8.1.17-r0 apk
|
php81-simplexml 8.1.18-r0 apk
|
||||||
php81-tokenizer 8.1.17-r0 apk
|
php81-tokenizer 8.1.18-r0 apk
|
||||||
php81-xml 8.1.17-r0 apk
|
php81-xml 8.1.18-r0 apk
|
||||||
php81-xmlwriter 8.1.17-r0 apk
|
php81-xmlwriter 8.1.18-r0 apk
|
||||||
php81-zip 8.1.17-r0 apk
|
php81-zip 8.1.18-r0 apk
|
||||||
phpdocumentor/reflection-common 2.2.0 php-composer
|
phpdocumentor/reflection-common 2.2.0 php-composer
|
||||||
phpdocumentor/type-resolver 1.6.2 php-composer
|
phpdocumentor/type-resolver 1.6.2 php-composer
|
||||||
phpoption/phpoption 1.9.0 php-composer
|
phpoption/phpoption 1.9.0 php-composer
|
||||||
|
|||||||
@@ -59,6 +59,7 @@ app_setup_block: |
|
|||||||
|
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
|
||||||
- { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
|
- { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
|
||||||
- { date: "14.11.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
|
- { date: "14.11.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
|
||||||
- { date: "04.11.22:", desc: "Build commits to upstream branch 2.x." }
|
- { date: "04.11.22:", desc: "Build commits to upstream branch 2.x." }
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
## Version 2022/11/14 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80 default_server;
|
listen 80 default_server;
|
||||||
@@ -9,6 +9,8 @@ server {
|
|||||||
|
|
||||||
server_name _;
|
server_name _;
|
||||||
|
|
||||||
|
include /config/nginx/ssl.conf;
|
||||||
|
|
||||||
root /app/www/public;
|
root /app/www/public;
|
||||||
index index.html index.htm index.php;
|
index index.html index.htm index.php;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user