LAB-linuxserver/docker-phpmyadmin
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-phpmyadmin.git synced 2026-02-20 08:40:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 3.19

Browse Source
This commit is contained in:
Eric Nemchik 2023-12-28 12:34:59 -06:00 committed by GitHub
commit f62ee0a18e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -297,6 +297,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **25.12.23:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.
* **06.09.23:** - Add support for custom themes.
* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
* **13.04.23:** - Move ssl.conf include to default.conf.

1
package_versions.txt
View File

@ -19,6 +19,7 @@ busybox-binsh 1.36.1-r5 apk
ca-certificates 20230506-r0 apk
ca-certificates-bundle 20230506-r0 apk
code-lts/u2f-php-server v1.2.1 php-composer
composer 2.6.6 binary
composer/ca-bundle 1.3.5 php-composer
coreutils 9.3-r1 apk
curl 8.5.0-r0 apk

3
readme-vars.yml
View File

@ -46,7 +46,8 @@ app_setup_block: |
# changelog
changelogs:
- { date: "21.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3." }
- { date: "28.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3." }
- { date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." }
- { date: "06.09.23:", desc: "Add support for custom themes." }
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
- { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }

14
root/defaults/nginx/site-confs/default.conf.sample
View File

@ -1,4 +1,4 @@
## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-phpmyadmin/commits/main/root/defaults/nginx/site-confs/default.conf.sample
## Version 2023/12/25 - Changelog: https://github.com/linuxserver/docker-phpmyadmin/commits/main/root/defaults/nginx/site-confs/default.conf.sample
map $sent_http_content_type $expires {
default off;
@ -19,7 +19,7 @@ server {
include /config/nginx/ssl.conf;
root /app/www/public;
index index.php index.html;
index index.html index.htm index.php;
location / {
# enable for basic auth
@ -28,15 +28,21 @@ server {
expires $expires;
try_files $uri $uri/ /index.php$is_args$args;
try_files $uri $uri/ /index.html /index.htm /index.php$is_args$args;
}
location ~ ^(.+\.php)(.*)$ {
# enable the next two lines for http auth
#auth_basic "Restricted";
#auth_basic_user_file /config/nginx/.htpasswd;
fastcgi_split_path_info ^(.+\.php)(.*)$;
if (!-f $document_root$fastcgi_script_name) { return 404; }
fastcgi_pass 127.0.0.1:9000;
fastcgi_index index.php;
fastcgi_read_timeout 3600;
include /etc/nginx/fastcgi_params;
fastcgi_read_timeout 3600;
}
# deny access to .htaccess/.htpasswd files