starred/docker
1
0
Fork 0
mirror of https://github.com/phpmyadmin/docker.git synced 2026-09-24 07:35:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
135 Commits 4 Branches 64 Tags
84493eb5e4a321d00a137d219dd8dda21bb51340
Commit Graph
135 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michal Čihař a602d1d4c6 Merge pull request #45 from nijel/pgp 
Verify downloaded tarball using PGP
 2016-08-08 13:47:24 +02:00
Michal Čihař 8a8e9eee0a Verify downloaded tarball using PGP 
Fixes #43

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-08-08 13:44:21 +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ř e6bc219529 Fix link to docs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-26 20:29:10 +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ř e713caa214 Remove mcrypt from dependencies, it is not needed with openssl 
Signed-off-by: Michal Čihař <michal@cihar.com>
4.6.3-1 		2016-06-14 15:45:56 +02:00
Michal Čihař cce91f08d4 Revert "Switch to PHP 7" 
Okay, the PHP 7 packages are not yet in released Alpine, we need to wait
for next release.

This reverts commit 9d0dec3d2e.
 2016-06-14 15:45:15 +02:00
Michal Čihař 9d0dec3d2e Switch to PHP 7 
Fixes #34

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-14 15:41:18 +02:00
Michal Čihař 563bcafcec Merge pull request #36 from ssteinerx/Update-base-image-to-Alpine-3.4 
Update base image to alpine:latest
 2016-06-14 15:39:32 +02:00
Steve Steiner 0bc8b4025b Update base image to alpine:latest 
As per note in previous version of Dockerfile to switch when 3.4 was out.

Also removed comment since it's done.
 2016-06-14 09:34:55 -04:00
Michal Čihař 812590e038 Remove PMA_ABSOLUTE_URI as it is no longer needed with 4.6 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-10 13:49:55 +02:00
Michal Čihař 7d6f729bc6 Fix PHP configuration name 
Fixes #32

Signed-off-by: Michal Čihař <michal@cihar.com>
4.6.2-3 		2016-06-10 12:34:58 +02:00
Michal Čihař 593d7f5f96 Include PHP modules for bz2 and zip 
Fixes #33

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-10 12:34:01 +02:00
Michal Čihař ae243b8077 Add test for sessions after shutdown (issue #32) 
Signed-off-by: Michal Čihař <michal@cihar.com>
4.6.2-2 		2016-06-06 10:16:08 +02:00
Michal Čihař 96e3c94c6b Try testing docker compose as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-06 10:10:28 +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
Michal Čihař 15ca16c9d0 Change deps to php5 
We would really prefer php7, but it's not there and php packages got
renamed to php5

Issue #31

Signed-off-by: Michal Čihař <michal@cihar.com>
4.6.2-1 		2016-05-27 13:48:21 +02:00
Michal Čihař 12997cea47 Document where bug reports on phpMyAdmin should go 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-27 09:59:50 +02:00
Michal Čihař 249e10decc Add comment why is there edge 
Signed-off-by: Michal Čihař <michal@cihar.com>
4.6.0-2 		2016-04-20 08:34:17 +02:00
Michal Čihař 6dd6b90902 Base on alpine:edge to get DNS fixes 
See https://twitter.com/thockin/status/704909611279781888 and
https://github.com/gliderlabs/docker-alpine/issues/8. This will be fixed
in 3.4, so at that point we can switch back to using stable.

Fixes #23 (DNS issues)
Fixes #27 (Kubernetes support)

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-20 08:31:53 +02:00
Michal Čihař 4893806cde More links to docker hub 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-20 08:31:11 +02:00
Michal Čihař f313ce3a84 Add docker badge 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-20 08:24:42 +02:00
Michal Čihař c250e52f63 Add link to documentation 
Signed-off-by: Michal Čihař <michal@cihar.com>
4.6.0-1 		2016-04-08 08:50:32 +02:00
Michal Čihař 8d27f0ff53 Merge pull request #24 from hkraal/add-mcrypt 
Missing php-mcrypt module
 2016-03-29 15:32:03 +02:00
Henk Kraal 9636db031d Add php-mcrypt module 2016-03-29 15:17:59 +02:00
Michal Čihař 8eb6c03572 Merge pull request #22 from sergeyfedotov/ini-env 
Make INI settings configurable via environment variables
 2016-02-15 17:30:45 +01:00
Sergey Fedotov b8d56cdf6f Make INI settings configurable via environment variables 2016-02-15 19:18:01 +03:00
Michal Čihař 972319d275 Merge pull request #19 from RickWieman/switch-port-80 
Switch to port 80 (instead of 8080)
 2016-02-08 11:06:47 +01: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