starred/docker
1
0
Fork 0
mirror of https://github.com/phpmyadmin/docker.git synced 2026-09-26 01:10:24 -04:00
Code Issues Packages Projects Releases Wiki Activity
416 Commits 4 Branches 64 Tags
4.9.3
Commit Graph
416 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař 8fd34e6581 Add docker layers badge 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-01 12:46:56 +02:00
Michal Čihař 63557d61e9 Revert "Remove not used files from packages" 
This reverts commit 38e99339ce.

It seams to break startup and does not really save anything reasonable.
 2016-08-29 11:52:36 +02:00
Michal Čihař bac44a4dbb Ignore test files for docker 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 10:58:20 +02:00
Michal Čihař f5fb1e42f9 Increase upload_max_filesize to be in sync with other settings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 10:54:30 +02:00
Michal Čihař 38e99339ce Remove not used files from packages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 10:51:35 +02:00
Michal Čihař 961aa4ce9a Remove not needed cleanup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 10:45:28 +02:00
Michal Čihař fa5c90cae4 Remove php cli, we do not need it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 10:40:07 +02:00
Michal Čihař 923f581fa9 Remove openlayers source from the image as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 10:35:52 +02:00
Michal Čihař 9a78cb3d33 Better cleanup of produced image 
- remove setup script
- remove tests
- remove SQL scripts

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 10:32:39 +02:00
Michal Čihař 23b9a14189 Remove no longer used variables 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 10:16:02 +02:00
Michal Čihař 341bc4965d Simplify tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 09:52:49 +02:00
Michal Čihař d6060e96b5 More verbose reporting in case of error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 09:41:40 +02:00
Michal Čihař 454dfd47ed Select import form by name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 09:35:35 +02:00
Michal Čihař 47eaf4cb6d Add test for arbitrary server on docker-compose 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 09:33:33 +02:00
Michal Čihař b80eea10a2 Do not try to use arbitrary server when not enabled 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 09:32:52 +02:00
Michal Čihař f6ae557f95 Igore robots.txt while testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 09:29:45 +02:00
Michal Čihař d5895311c0 Fix params, correctly handle error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 09:23:08 +02:00
Michal Čihař 1c0936f359 Improve server testing 
- Use python-mechanize based script
- Test file upload as well

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 09:17:35 +02:00
Michal Čihař cc72b8a432 Really test that arbitrary server settings works 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 08:18:03 +02:00
Michal Čihař 5acaf20477 Whitespace cleanup in nginx configuration 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 08:13:54 +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ř 4b12fdda7c Disable fastcgi buffering 
We can immedieately send out fastcgi response.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 08:11:48 +02:00
Michal Čihař 0ffb4af4c4 Increase maximal execution time 
- This is needed to allow big SQL uploads.
- Also keep in sync nginx and PHP limit.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 08:06:29 +02:00
Michal Čihař a76914f87d Increase nginx buffers and maximal request size 
We can expect people posting big SQL files, so let's allow 128M.

Issue #32

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-29 08:05:12 +02:00
Michal Čihař 0c3251bf9e Disable environment cleanup on PHP FPM 
We pass settings by environment, so it has to be preserved.

Fixes #49

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 19:21:40 +02:00
Michal Čihař 8bec114378 Adjust description to match current setup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 10:21:52 +02:00
Michal Čihař d6be2b9f1a Fix syntax 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 10:12:39 +02:00
Michal Čihař 32d4928e0a Always test against latest versions of databases 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 10:11:52 +02:00
Michal Čihař 978bdb4b25 Display logs only on error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 10:09:40 +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ř 84493eb5e4 Fix sessions permissions 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 09:54:34 +02:00
Michal Čihař 91b5bd0fcd Merge branch 'nginx' 2016-08-28 09:47:36 +02:00
Michal Čihař a1c139f901 Debug failures 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 09:47:09 +02:00
Michal Čihař 507105ec70 Merge pull request #48 from nijel/nginx 
Use supervisor +  nginx + php-fpm
 2016-08-28 09:18:28 +02:00
Michal Čihař feb1c92581 Remove debugging settings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 09:17:59 +02:00
Michal Čihař d12c0493ee Improve sessions configuration 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 09:10:37 +02:00
Michal Čihař 00ff178fd1 Add php.ini configuration file 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-28 09:09:03 +02:00
Michal Čihař b611c5adde Display logs at the end of test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-27 13:29:48 +02:00
Michal Čihař 1b2ff90941 Better name for docker-compose 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-27 13:24:55 +02:00
Michal Čihař 5cb63716a7 Move tests to separate script 
We repeat same for every container anyway.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-27 13:24:55 +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ř 9e0529c6f5 Revert "Remove PMA_ABSOLUTE_URI as it is no longer needed with 4.6" 
This reverts commit 812590e038.

Fixes #40

Please note that the setting will take no effect till phpMyAdmin 4.6.5.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 15:43:28 +02:00
Michal Čihař e7d5c0f075 Add comments to Dockerfile 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 11:00:34 +02:00
Michal Čihař 690acf54dd Document what credentials are used, it seems to be common problem of users 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-17 10:36:42 +02:00
Michal Čihař 901156a7eb Update to 4.6.4 
Signed-off-by: Michal Čihař <michal@cihar.com>
4.6.4-1 		2016-08-17 10:31:36 +02:00
Michal Čihař ced6ab371a Disable apk cache for removal 
Signed-off-by: Michal Čihař <michal@cihar.com>
4.6.3-3 		2016-08-08 14:09:08 +02:00
Michal Čihař 9d258fed4f Merge pull request #46 from nijel/master 
Specify version in variable
 2016-08-08 14:08:40 +02:00
Michal Čihař e59a8bab47 Specify version in variable 
This way we can reproduce build of tags, with latest approach used so
far, you would always get the latest version even when building older
tag.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-08 14:05:53 +02:00
Michal Čihař c099349ef3 Remove not needed curl installation 
Signed-off-by: Michal Čihař <michal@cihar.com>
4.6.3-2 		2016-08-08 13:52:48 +02:00