starred/docker
1
0
Fork 0
mirror of https://github.com/phpmyadmin/docker.git synced 2026-09-24 23:49:37 -05: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ř 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
Michal Čihař 89fabea4ad Merge pull request #2 from CybotTM/compose+arbitrary 
add support for arbitrary servers and compose configuration file
 2015-12-04 13:15:12 +01:00
Sebastian Mendel 4b59242db8 add docker-compose configuration file 2015-12-04 13:02:28 +01:00
Sebastian Mendel cd7cc22fd8 add support for arbitrary servers 2015-12-04 13:02:28 +01:00
Michal Čihař 4ba57f81ac Remove login test 
This currently doesn't work and it's hard to debug due to missing error
reporting in the login phase. This will be improved in next phpMyAdmin
release and the test should be revisited by then.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 12:16:10 +01:00
Michal Čihař 7f64643ef5 Test login as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 11:54:13 +01:00
Michal Čihař 16eff3a67f Download home page in test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 11:40:51 +01:00
Michal Čihař 71a7b6b401 List running processes 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 11:39:33 +01:00
Michal Čihař 0b99ee6512 Simplify progress bar 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 11:36:00 +01:00
Michal Čihař f0486dddda Try running db server as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 11:35:02 +01:00
Michal Čihař 77feb69d33 Add Travis badge 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 11:29:45 +01:00
Michal Čihař ee8b9c1b3a Standard name for readme 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 11:29:14 +01:00
Michal Čihař 6aa6bf1d16 Fix build command 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 11:28:23 +01:00
Michal Čihař 257ee7edfe Add .travis.yml 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-04 11:25:33 +01:00
Michal Čihař ae9b76cc9c Merge pull request #1 from CybotTM/master 
concatenate Dockerfile commands - reduces final images size
 2015-12-04 11:23:06 +01:00
Sebastian Mendel 6b92f16d07 concatenate Dockerfile commands - reduces final images size 2015-12-04 11:13:03 +01:00