starred/docker
1
0
Fork 0
mirror of https://github.com/phpmyadmin/docker.git synced 2026-08-28 02:24:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
282 Commits 4 Branches 64 Tags
4.7.0-2
Commit Graph
282 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michal Čihař 3febe28134 Document 4.7 tag 
Signed-off-by: Michal Čihař <michal@cihar.com>
4.7.0-2 		2017-04-11 17:33:56 +02:00
Michal Čihař 1bcaeb5fec Fix getting empty values from environment 
If environemnt variable is empty and is not part of $_ENV, the getenv
(obviously) returns empty string, but we should use it.

Fixes #118

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-11 17:28:29 +02:00
Michal Čihař 1204bcd696 Do not set password to null when not specified 
This makes the authentication code think this parameter was not set at
all.

Fixes #118

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-11 17:21:32 +02:00
ericfjosneandMichal Čihař 447c731aaa Add PMA_PORTS configuration 
Now enabling custom port for each hosts of the PMA_HOSTS environment variable, through the use of a new PMA_PORTS environment variable.

Fixes #112
 2017-04-07 15:24:36 +02:00
Michal Čihař 69a0e832d9 Install php7-ctype into the container 
It is needed by Symfony ExpressionLanguage (which is used by
motranslator for plurals).

This can be reverted once ExpressionLanguage is fixed
https://github.com/symfony/symfony/pull/22325

Fixes #115

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-07 07:53:31 +02:00
Michal Čihař 0fb67d3437 Adjust cleanup to current releases 
Signed-off-by: Michal Čihař <michal@cihar.com>
4.7.0-1 		2017-04-05 20:39:40 +02:00
Michal Čihař 331c3452f4 These files are no longer part of release 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-05 20:37:56 +02:00
Michal Čihař 942a0dd5ff Update to 4.7.0 
Fixes #113

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-04-05 20:10:35 +02:00
Michal Čihař c76721ba8b Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 15:18:16 +02:00
Michal Čihař 554e98df45 Add dabase server link to docker-compose 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 15:14:02 +02:00
Michal Čihař 5646cff98e Do not report retries 
This is expected to take some time...

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 15:09:20 +02:00
Michal Čihař 382f9b9489 better progress reporting 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 15:07:27 +02:00
Michal Čihař 70b6297233 Fix path to testing configuration 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 15:02:09 +02:00
Michal Čihař 6314b17ebd Need more time to run tests 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 15:01:34 +02:00
Michal Čihař 63fd59434e Display logs on timeout 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 14:51:04 +02:00
Michal Čihař a2782dd8f6 Detect correct path to sql file 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 14:50:01 +02:00
Michal Čihař 61bc237761 Document this is supposed to fail right now 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 14:30:32 +02:00
Michal Čihař 6736b49f7a Fix expression calculation 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 14:27:00 +02:00
Michal Čihař b5305971ba Verify test result from docker-compose.testing.yml 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 11:38:35 +02:00
Michal Čihař 2ebc458766 Run pip installation while building Docker container 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 11:30:44 +02:00
Michal Čihař 21b0804166 Use latest images for composer testing as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 11:30:21 +02:00
Michal Čihař b35554203c Fix path to testing script 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 11:27:10 +02:00
Michal Čihař e5a78047b2 Move all testing files into subdirectory 
This makes the file structure a bit cleaner.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 11:24:10 +02:00
Michal Čihař a7aa88b4c6 Specify correct server to test 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 11:18:09 +02:00
Michal Čihař b45585ea00 Remove trailing whitespace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 11:12:31 +02:00
Michal Čihař 5d3536c381 Ignore testing dockerfile from docker 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 11:12:11 +02:00
Michal Čihař 24679b0c0b Run docker-compose tests in Travis 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-03-28 11:11:04 +02:00
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 LobatoandMichal Čihař 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 LobatoandMichal Čihař 4ddc41bc29 Document the docker-compose test environment 2017-03-28 11:04:12 +02:00
Paulo LobatoandMichal Čihař 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řandGitHub 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