starred/docker
1
0
Fork 0
mirror of https://github.com/phpmyadmin/docker.git synced 2026-08-28 02:24:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
235 Commits 4 Branches 64 Tags
4.6.5.2-3
Commit Graph
235 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal ČihařandGitHub ff50a29234 Merge pull request #102 from nijel/alpine-3.5 
Upgrade to Alpine 3.5
4.6.5.2-3 		2017-01-02 17:14:57 +01:00
Michal Čihař e943ff30d0 Merge remote-tracking branch 'origin/pull/94' into alpine-3.5 2017-01-02 17:00:46 +01:00
Michal Čihař 19a74cb25f Fix program name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-02 16:56:07 +01:00
Michal Čihař a9cce1d72c Upgrade to Alpine 3.5 
Also switch to PHP 7

Fixes #34

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-22 19:41:50 +01:00
Michal Čihař 4bc799bdb4 Fix markup 
Signed-off-by: Michal Čihař <michal@cihar.com>
4.6.5.2-2 		2016-12-06 11:20:27 +01:00
Michal Čihař cc3e874181 Document hub tags 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-06 11:19:29 +01:00
Michal Čihař ba761c1841 Update to 4.6.5.2 
Signed-off-by: Michal Čihař <michal@cihar.com>
4.6.5.2-1 		2016-12-06 09:03:57 +01:00
Michal Čihař d67fafa56c Remove not needed dependency on ctype 
Fixes #96

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-05 08:41:19 +01:00
Michal Čihař bca3574cf3 Use absolute path here 
Issue #95

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 11:34:21 +01:00
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ř 78f2603e29 Remove more not needed doc files 
Fixes #79

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-30 11:16:40 +01:00
Michal Čihař 0715366ee3 Add version label 
Issue #85

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 16:39:38 +01:00
Sam Mousa a4dc5b36cd Added some missing php extensions. 2016-11-28 10:48:41 +01:00
Sam Mousa f626ed635b Updated to use alpine edge and php7. 2016-11-28 10:40:43 +01:00
Michal Čihař 2a761b2a73 Increase upload size limit to 512MB 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 10:39:25 +01:00
Michal ČihařandGitHub f544b5ca97 Merge pull request #92 from nijel/master 
Try to reorder commands for better Docker layer caching
4.6.5.1-1 		2016-11-28 10:23:19 +01:00
Michal ČihařandGitHub d53aadc0bb Merge pull request #93 from nijel/doc-cleanup 
Cleanup documentation folder
 2016-11-28 10:23:12 +01:00
Michal Čihař f581555bcf Move all configuration to /etc 
* configuration is now in /etc
* reorder commands for better Docker layer caching

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 10:19:52 +01:00
Michal Čihař 5cef68749a Cleanup documentation folder 
We really do not need documentation source in the Docker image.

Fixes #79

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 10:12:56 +01:00
Michal ČihařandGitHub 6c1410cbef Merge pull request #91 from nijel/master 
Split setting variable from export
 2016-11-28 09:37:14 +01:00
Michal Čihař 352e5fe6ed Split setting variable from export 
This way we can correctly get error from the mkdir.

Fixes #86

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-28 09:31:58 +01:00
Michal ČihařandGitHub c81443abd1 Merge pull request #90 from vancepym/patch-1 
Bump version to 4.6.5.1
 2016-11-28 09:29:51 +01:00
vancepymandGitHub 7177389b20 Bump version to 4.6.5.1 2016-11-28 13:35:17 +08:00
Michal ČihařandGitHub 3142368a07 Merge pull request #89 from asolopovas/patch-1 
Cancel removal of /www/sql
 2016-11-25 15:23:28 +01:00
Andrius SolopovasandGitHub a017968642 Cancel removal of /www/sql 
Please do not delete /www/sql folder as it contains create_tables.sql file that creates pma tables and phpmyadmin db for configuration storage
 2016-11-24 21:45:58 +00: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ř 2e371a1cb5 Simplify expression evaluation 
Issue #87

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-21 16:07:48 +01:00
Michal Čihař af486daba0 Add quotes around parameters 
Issue #87

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-21 16:07:45 +01:00
Michal Čihař a53f732a77 Use URL variable instead of hardcoding it 
Issue #87

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-11-21 16:07:42 +01:00
Michal Čihař 50f822a1c9 Remove more not needed files 
Fixes #78

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-25 10:45:00 +02:00
Michal Čihař 101ce17f0d Document where to report issues 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 13:14:37 +02:00
Michal ČihařandGitHub f9c263baf2 Merge pull request #77 from nijel/nginx-setup 
Improve nginx setup
 2016-10-18 13:07:18 +02: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ř 29bcc43956 Allow only GET, HEAD and POST methods 
Fixes #64

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 13:03:27 +02:00
Michal Čihař 379a7df699 Avoid extending try_files too much 
Fixes #63

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 13:03:27 +02:00
Michal Čihař ab9d56ffc1 Deny access to all hidden files 
Fixes #67

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 13:03:27 +02:00
Michal ČihařandGitHub e3abc1a5bd Merge pull request #76 from nijel/php-name 
Avoid encoding PHP version in socket or log name
 2016-10-18 12:58:12 +02:00
Michal ČihařandGitHub 1807d08963 Merge pull request #75 from nijel/opcache 
Optimize PHP opcache settings
 2016-10-18 12:56:39 +02:00
Michal Čihař a4ddcb67ce Add tests for user configuration override 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 12:55:53 +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ř 9ddd36cd25 Optimize PHP opcache settings 
- opcache.save_comments=0 to avoid storing comments which we do not need
- opcache.validate_timestamps=0 the timestamps validation should not be
  needed as container is restarted on change
- fixes #71

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 12:33:58 +02:00
Michal Čihař 6ab1e50550 Limit waiting for container to come up 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-10-18 12:26:41 +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řandGitHub 465ecb08b3 Merge pull request #72 from asosso/master 
Adding PMA_VERBOSE and PMA_VERBOSES environment variables
 2016-10-04 16:19:38 +02:00
Andrea Sosso 07afa363d7 Adding PMA_VERBOSE and PMA_VERBOSES environment variables 2016-10-04 15:25:13 +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ř 0a9d050db1 Allow access to /tmp 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 10:01:33 +02:00
Michal Čihař edce528acc Can not use armored PGP for keyring 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 09:25:18 +02:00
Michal Čihař 7b9abff0ff Deny access to libraries and templates 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 09:18:00 +02:00
Michal Čihař ad4b811c44 Set loglevel for PHP-FPM 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-26 09:15:27 +02:00