starred/docker
1
0
Fork 0
mirror of https://github.com/phpmyadmin/docker.git synced 2026-08-28 10:15:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
335 Commits 4 Branches 64 Tags
edge-4.8
Commit Graph
25 Commits
Author SHA1 Message Date
Michal Čihař c5c62ee24b Create secret and user configs in /etc/phpmyadmin 
Fixes #95

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 11:17:43 +01:00
Michal Čihař 9b115208c7 Simplify password generating 
- remove not needed cat, this makes it consume less entropy due to less
  buffering
- use $() instead of `` in shell

Fixes #78

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-21 16:09:28 +01:00
Michal ČihařandGitHub 71bf1edde3 Merge pull request #74 from nijel/userconfig 
Fix user configuration and add tests for it
 2016-10-18 13:03:57 +02:00
Michal Čihař b2c5075876 Avoid encoding PHP version in socket or log name 
Fixes #68

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 12:39:18 +02:00
Michal Čihař cd02b8d305 Move config.user.inc.php to /www 
It needs to be stored in a location allowed by open_basedir.

Fixes #73

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 12:09:58 +02:00
Michal Čihař 8a3544a20a Reduce supervisor loglevel 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 09:18:08 +02:00
Michal Čihař 8c13128da9 Correctly prepare log for FPM 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-20 12:07:58 +02:00
Michal Čihař dc56655368 Move PHP socket 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-20 11:56:05 +02:00
Michal Čihař 7f07a54e26 Configure temp file for bigger uploads 
Issue #32

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 08:13:16 +02:00
Michal Čihař 5b5edcafb1 Remove debugging code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 10:08:17 +02:00
Michal Čihař d784d12452 Fix permissions on start 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 10:02:57 +02:00
Michal Čihař d70630f09a Initial attempt to use nginx + php-fpm 
Replaced php built in server with supervisord + nginx + php-fpm.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-27 13:24:55 +02:00
Michal Čihař a5dfdfe993 Move user configuration and simplify it's setup 
- move it to root directory to make it easier to use as volume

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-08 13:09:32 +02:00
Michal Čihař f67529f585 Merge remote-tracking branch 'origin/pull/42' 2016-08-08 12:56:21 +02:00
Michal Čihař ef53180e08 Increase number of chars allowed in secret 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-26 11:56:47 +02:00
Douglas Wagner 4cadf08f00 Updated for installing config.userdef.inc.php hook to update PHPMYADMIN custom user setttings without modifying/overriding the config.inc.php file. 2016-07-11 12:49:04 -05:00
Michal Čihař 7d6f729bc6 Fix PHP configuration name 
Fixes #32

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-10 12:34:58 +02:00
Michal Čihař 23cb076766 Use persistent volume for sessions 
Issue #32

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-06 10:03:35 +02:00
Sergey Fedotov b8d56cdf6f Make INI settings configurable via environment variables 2016-02-15 19:18:01 +03:00
Rick Wieman a87ccec937 Switch to port 80 (instead of 8080) 
As this is a Docker container running a web application, it would make sense to expose the http port (80) instead of port 8080. A user can always specify the 'external' port to his liking using e.g. `-p 8080:80`.

Fixes #18.
 2016-02-08 10:41:25 +01:00
Peter Suschlik 4ceca79f63 Make php server PID 1 
It's a good practice to make the service PID 1
(although php cli does not handle `kill -TERM` at all).
 2016-01-12 15:08:35 +01:00
Michal Čihař 7d566641b4 Use just one configuration file 
We can generate correct values inside it, no need for magic handling
more of the files.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 13:36:47 +01:00
Sebastian Mendel 2bd79639b2 drop execute permission on run.sh - this is only required inside image 2015-12-07 09:42:08 +01:00
Michal Čihař 32a39ca18d Generate random blowfish secret for every instance 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 13:22:39 +01:00
Sebastian Mendel cd7cc22fd8 add support for arbitrary servers 2015-12-04 13:02:28 +01:00