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
355 Commits 4 Branches 64 Tags
4.8.4
Commit Graph
355 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař f5c3a1b628 Avoid using echo -e 
It is not working on some /bin/sh versions and there is no reason to
enforce bash just because of this.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 11:08:37 +02:00
Michal Čihař d79872987d Avoid setting set -e 
We are handling error codes, so we do not want script to terminate automatically

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 11:08:10 +02:00
Paulo Lobato ed5d9c5fc9 Provision local test env similar the CI's tests 
- Run tests inside or not container
 2017-03-28 11:06:54 +02:00
Michal Čihař 446ed9e0d0 Use separate Dockerfile for testing image 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 11:05:23 +02:00
Paulo Lobato 4ddc41bc29 Document the docker-compose test environment 2017-03-28 11:04:12 +02:00
Paulo Lobato ec28d93349 Add database containers on compose test env 
- Add MariaDB 10.1 version
  - Add MySQL 5.7 version
  - Link databases to PHPMyAdmin container
 2017-03-28 11:03:46 +02:00
Michal Čihař 0ac5c9516c Fix syntax errors 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-22 11:31:55 +01:00
Michal Čihař a1270dc0d5 Avoid using non ascii chars 
This just makes the testing harder

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-22 11:26:18 +01:00
Michal Čihař 73ea59e04b Impove coding style 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-22 11:25:56 +01:00
Michal Čihař 54a5953b37 Mechanize does not support Python 3 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-22 11:11:01 +01:00
Michal Čihař d07907e15d Use python 3 for testing 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-22 11:08:40 +01:00
Michal Čihař e2f38b46ab Install html5lib needed for mechanize 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-22 11:02:12 +01:00
Michal Čihař cbcd23494f Generate password before using it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-22 10:59:03 +01:00
Michal Čihař 4432177a0a Generate random passwords for test 
This way nobody will think there is anything secret in the
.travis.yml.

See https://github.com/phpmyadmin/phpmyadmin/issues/13115

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-22 10:34:03 +01:00
Michal Čihař e2052a2066 Enable opcache fast shutdown 
Signed-off-by: Michal Čihař <michal@cihar.com>
4.6.6-2 		2017-03-02 09:54:30 +01:00
Michal Čihař 6e3955516f Disable opcache.use_cwd 
All scripts are executed in single working directory, so it should not
cause any harm and according to documentation it should perform better.

Issue #98

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-02 09:45:40 +01:00
Michal Čihař 29d69f34ad Disable opcache API 
By setting non existing path as restrict_api.

Fixes #65

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-02 09:44:13 +01:00
Michal Čihař ddfe8e2b1c Update php.ini 
Update to match php.ini-production from PHP 7.0.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-02 09:40:43 +01:00
Michal Čihař facd453fc2 Disable allow_url_fopen 
Fixes #55

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-02 09:27:46 +01:00
Michal Čihař b4d05f2604 Update to 4.6 
Fixes #105

Signed-off-by: Michal Čihař <michal@cihar.com>
4.6.6-1 		2017-02-06 11:24:11 +01:00
Michal Čihař 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ř 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ř 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ř 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ř c81443abd1 Merge pull request #90 from vancepym/patch-1 
Bump version to 4.6.5.1
 2016-11-28 09:29:51 +01:00
vancepym 7177389b20 Bump version to 4.6.5.1 2016-11-28 13:35:17 +08:00
Michal Čihař 3142368a07 Merge pull request #89 from asolopovas/patch-1 
Cancel removal of /www/sql
 2016-11-25 15:23:28 +01:00
Andrius Solopovas 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