starred/docker
1
0
Fork 0
mirror of https://github.com/phpmyadmin/docker.git synced 2026-08-29 02:34:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
81 Commits 4 Branches 64 Tags
4.5.3.1-1
Commit Graph
81 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař 104da54054 Merge pull request #14 from splattael/master 
Make php server PID 1
4.5.3.1-1 		2016-01-12 16:36:47 +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ř 03470a9163 Merge pull request #13 from lorenz/patch-1 
Allows to set the user-facing URL, fixes #12
 2016-01-09 11:07:09 +01:00
Lorenz Brun 3627486936 Added docs 2016-01-09 02:12:55 +01:00
Lorenz Brun 3c336a7816 Added to list of environment variables 2016-01-09 02:09:29 +01:00
Lorenz Brun 1ac16c0daf Allows to set the user-facing URL, fixes #12 2016-01-09 02:06:01 +01:00
Michal Čihař 5c58a06622 Merge pull request #11 from Soullivaneuh/patch-1 
Allow empty password
 2015-12-15 14:06:28 +01:00
Sullivan SENECHAL 261a9107e2 Allow empty password 2015-12-15 13:46:03 +01:00
Michal Čihař c6b5962723 Ensure we get the environment in most cases 
It turns out that PHP versions differ in passing Unix environment, let's
fallback to getenv to fix that.

Fixes #10

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 10:43:17 +01:00
Michal Čihař 0176d06524 Ignore local files 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 10:30:12 +01:00
Michal Čihař 843953e72b Adjust test to check actual arbitrary server setup 
Issue #10

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 10:29:19 +01:00
Michal Čihař 8f0181616e Allow to sepcify more db servers 
Fixes #7

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 14:01:19 +01:00
Michal Čihař e6ba64cd5f Fix typo in config file 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 13:49:36 +01:00
Michal Čihař b0a8bc0bec Add support for config auth method 
Fixes #8

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 13:39:31 +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
Michal Čihař 85397a6416 Do the changes in one sed command 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 13:33:13 +01:00
Michal Čihař fc0e721977 Merge pull request #9 from netroby/master 
Increase PHP file upload size limit to 64MB
 2015-12-14 13:22:40 +01:00
ZhiFeng Hu f6e445ddeb Increase PHP file upload size limit to 64MB 
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
 2015-12-10 17:46:15 +08:00
Michal Čihař 18c6c01ca6 Avoid conflicting ports 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 14:50:17 +01:00
Michal Čihař 465756ae38 Improve readme 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 14:47:29 +01:00
Michal Čihař 2f9ca126d4 Fix docker container name 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 14:45:26 +01:00
Michal Čihař cf8f6d45c8 Fix typo in test script 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 14:42:38 +01:00
Michal Čihař 409324545e Fix typo in title 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 14:42:38 +01:00
Michal Čihař b1946a827e Merge pull request #6 from CybotTM/master 
add Makefile and .dockerignore
 2015-12-07 14:41:36 +01:00
Michal Čihař 020fd6f8c7 Add support to specify MySQL server in environment 
Fixes #4

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-07 14:38:48 +01:00
Sebastian Mendel 844798cd19 add Makefile for easier building and testing 2015-12-07 10:52:57 +01:00
Sebastian Mendel ab47652269 add .dockerignore file - hide files competely from docker (deamon) for security and performance 2015-12-07 10:10:55 +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ř 4b4dca1451 Copy both configs in one step 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 15:14:48 +01:00
Michal Čihař ba5957ac0d Cleanup not needed files after extracting 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 15:08:28 +01:00
Michal Čihař 85ed692cd6 Simplify setup 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 15:00:05 +01:00
Michal Čihař fdc3fa032a Apline has older tar not understanding --strip-components 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:56:17 +01:00
Michal Čihař 42c72936cb Use curl for download 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:51:45 +01:00
Michal Čihař 6126a727a3 No need for wget in image 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:48:09 +01:00
Michal Čihař f1c00305f7 Base image directly on alpine 
This allows us to optimize list of included packages.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:44:29 +01:00
Michal Čihař bbd4ad0d6b Test arbitrary server setup as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:33:02 +01:00
Michal Čihař 24f22f1dac No failures allowed 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:28:07 +01:00
Michal Čihař 74a6d45a47 Define port at one point 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:24:29 +01:00
Michal Čihař abf22c41fb Check status 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:23:44 +01:00
Michal Čihař fac2227b31 Shorten download progress 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:23:02 +01:00
Michal Čihař 38203f488b Stop after testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:17:55 +01:00
Michal Čihař 50c5607088 Run in background 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:16:42 +01:00
Michal Čihař c843d2880b Avoid conflicts in ports 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:12:13 +01:00
Michal Čihař 06584d7f9e Test MySQL is working correctly 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:10:26 +01:00
Michal Čihař 14a4fff506 Avoid conflict 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:07:52 +01:00
Michal Čihař 8296362a82 Improve readme 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:07:13 +01:00
Michal Čihař 5f089160b7 Try docker-compose as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 14:05:10 +01:00
Michal Čihař 790dfe2ff7 Merge pull request #3 from CybotTM/master 
fix for: add support for arbitrary servers and compose configuration file
 2015-12-04 13:45:15 +01:00
Sebastian Mendel dd77ed63f9 fix image source in docker-compose.yml - use official image from registry instead of local build 2015-12-04 13:30:50 +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