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

Merge pull request #20 from linuxserver/more-improvements

Browse Source
This commit is contained in:
Adam 2022-08-25 10:34:42 +01:00 committed by GitHub
commit 2ee9c6cd84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -19,14 +19,15 @@ RUN \
apk add -U --upgrade --no-cache \
curl \
jq \
php8-gd \
php8-bz2 \
php8-curl \
php8-dom \
php8-gd \
php8-iconv \
php8-mysqli \
php8-opcache \
php8-iconv \
php8-dom \
php8-pecl-uploadprogress \
php8-tokenizer \
php8-curl \
php8-zip && \
echo "**** configure php-fpm to pass env vars ****" && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \
@ -79,11 +80,12 @@ RUN \
/tmp/phpmyadmin.tar.xz -C \
/app/www/public/ --strip-components=1 && \
sed -i "s@'configFile' =>.*@'configFile' => '/config/phpmyadmin/config.inc.php',@" "/app/www/public/libraries/vendor_config.php" && \
echo "**** cleanup ****" && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/tmp/*
/tmp/* \
/app/www/public/setup
COPY root/ /

12
Dockerfile.aarch64
View File

@ -18,14 +18,15 @@ RUN \
apk add -U --upgrade --no-cache \
curl \
jq \
php8-gd \
php8-bz2 \
php8-curl \
php8-dom \
php8-gd \
php8-iconv \
php8-mysqli \
php8-opcache \
php8-iconv \
php8-dom \
php8-pecl-uploadprogress \
php8-tokenizer \
php8-curl \
php8-zip && \
echo "**** configure php-fpm to pass env vars ****" && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \
@ -82,7 +83,8 @@ RUN \
apk del --purge \
build-dependencies && \
rm -rf \
/tmp/*
/tmp/* \
/app/www/public/setup
COPY root/ /

12
Dockerfile.armhf
View File

@ -18,14 +18,15 @@ RUN \
apk add -U --upgrade --no-cache \
curl \
jq \
php8-gd \
php8-bz2 \
php8-curl \
php8-dom \
php8-gd \
php8-iconv \
php8-mysqli \
php8-opcache \
php8-iconv \
php8-dom \
php8-pecl-uploadprogress \
php8-tokenizer \
php8-curl \
php8-zip && \
echo "**** configure php-fpm to pass env vars ****" && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8/php-fpm.d/www.conf && \
@ -82,7 +83,8 @@ RUN \
apk del --purge \
build-dependencies && \
rm -rf \
/tmp/*
/tmp/* \
/app/www/public/setup
COPY root/ /

2
root/defaults/config.inc.php
View File

@ -1,5 +1,7 @@
<?php
// Sourced from https://github.com/phpmyadmin/docker/blob/master/config.inc.php
require('/config/phpmyadmin/config.secret.inc.php');
/* Ensure we got the environment */

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

@ -1,5 +1,12 @@
## Version 2022/08/20 - 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;
~js/ max;
~themes/ max;
~doc/ max;
}
server {
listen 80 default_server;
listen [::]:80 default_server;
@ -10,26 +17,23 @@ server {
server_name _;
root /app/www/public;
index index.html index.htm index.php;
index index.php index.html;
location / {
# enable for basic auth
#auth_basic "Restricted";
#auth_basic_user_file /config/nginx/.htpasswd;
try_files $uri $uri/ /index.php$is_args$args;
}
expires $expires;
# set expiration of assets to MAX for caching
location ~* \.(ico|css|js)(\?[0-9]+)?$ {
expires max;
log_not_found off;
try_files $uri $uri/ /index.php$is_args$args;
}
location ~ ^(.+\.php)(.*)$ {
fastcgi_split_path_info ^(.+\.php)(.*)$;
fastcgi_pass 127.0.0.1:9000;
fastcgi_index index.php;
fastcgi_read_timeout 3600;
include /etc/nginx/fastcgi_params;
}