Branch: refs/heads/master Home: https://github.com/phpmyadmin/docker Commit: ec28d9334952aff19c270f09775dd758f95841e4 https://github.com/phpmyadmin/docker/commit/ec28d9334952aff19c270f09775dd758... Author: Paulo Lobato <paulo.lobatojr@hotmail.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M docker-compose.testing.yml Log Message: ----------- Add database containers on compose test env - Add MariaDB 10.1 version - Add MySQL 5.7 version - Link databases to PHPMyAdmin container Commit: 4ddc41bc29df7bab345a8f4fd248d4ccd31cd439 https://github.com/phpmyadmin/docker/commit/4ddc41bc29df7bab345a8f4fd248d4cc... Author: Paulo Lobato <paulo.lobatojr@hotmail.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M README.md Log Message: ----------- Document the docker-compose test environment Commit: 446ed9e0d0a49fae722649bfa8ba3f77e58934a8 https://github.com/phpmyadmin/docker/commit/446ed9e0d0a49fae722649bfa8ba3f77... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .dockerignore A Dockerfile-testing M docker-compose.testing.yml A test-mariadb.ini A test-mysql.ini Log Message: ----------- Use separate Dockerfile for testing image Signed-off-by: Michal Čihař <michal@cihar.com> Commit: ed5d9c5fc94103d38b68f07ed1b0c92cda87c295 https://github.com/phpmyadmin/docker/commit/ed5d9c5fc94103d38b68f07ed1b0c92c... Author: Paulo Lobato <paulo.lobatojr@hotmail.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M test-docker.sh Log Message: ----------- Provision local test env similar the CI's tests - Run tests inside or not container Commit: d79872987d71686b4fff6192a6ed0ecf9fcc5a24 https://github.com/phpmyadmin/docker/commit/d79872987d71686b4fff6192a6ed0ecf... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M test-docker.sh Log Message: ----------- 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> Commit: f5c3a1b62801be35755071189132ac69bbe844a2 https://github.com/phpmyadmin/docker/commit/f5c3a1b62801be35755071189132ac69... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M test-docker.sh Log Message: ----------- 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> Commit: 24679b0c0bd58583d55c8fb2b67e5418bb727a67 https://github.com/phpmyadmin/docker/commit/24679b0c0bd58583d55c8fb2b67e5418... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .travis.yml Log Message: ----------- Run docker-compose tests in Travis Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 5d3536c3815630f83775f1c8c7c425089e595cb6 https://github.com/phpmyadmin/docker/commit/5d3536c3815630f83775f1c8c7c42508... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .dockerignore Log Message: ----------- Ignore testing dockerfile from docker Signed-off-by: Michal Čihař <michal@cihar.com> Commit: b45585ea00b24567cb126cca4a9c66232936c2a1 https://github.com/phpmyadmin/docker/commit/b45585ea00b24567cb126cca4a9c6623... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M test-mariadb.ini M test-mysql.ini Log Message: ----------- Remove trailing whitespace Signed-off-by: Michal Čihař <michal@cihar.com> Commit: a7aa88b4c6a588ac2050df2928aca74b32dc8ad8 https://github.com/phpmyadmin/docker/commit/a7aa88b4c6a588ac2050df2928aca74b... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .travis.yml Log Message: ----------- Specify correct server to test Signed-off-by: Michal Čihař <michal@cihar.com> Commit: e5a78047b27509959c6d3797ebf47ea49ee3f4fc https://github.com/phpmyadmin/docker/commit/e5a78047b27509959c6d3797ebf47ea4... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .dockerignore R Dockerfile-testing R config.test.inc.php M docker-compose.testing.yml R phpmyadmin_test.py R test-docker.sh R test-mariadb.ini R test-mysql.ini A testing/Dockerfile A testing/config.test.inc.php A testing/phpmyadmin_test.py A testing/test-docker.sh A testing/test-mariadb.ini A testing/test-mysql.ini A testing/world.sql R world.sql Log Message: ----------- Move all testing files into subdirectory This makes the file structure a bit cleaner. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: b35554203c9a6ea9861c0bb1b4658e909a8f2118 https://github.com/phpmyadmin/docker/commit/b35554203c9a6ea9861c0bb1b4658e90... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .travis.yml Log Message: ----------- Fix path to testing script Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 21b080416681e57ee264a1c95c043132936a1cfa https://github.com/phpmyadmin/docker/commit/21b080416681e57ee264a1c95c043132... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M docker-compose.testing.yml Log Message: ----------- Use latest images for composer testing as well Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 2ebc4587664a01c151ba971bad02bf12f3bc738e https://github.com/phpmyadmin/docker/commit/2ebc4587664a01c151ba971bad02bf12... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/Dockerfile M testing/test-docker.sh Log Message: ----------- Run pip installation while building Docker container Signed-off-by: Michal Čihař <michal@cihar.com> Commit: b5305971ba5ecf18b47611ff3cf7e832267dd08e https://github.com/phpmyadmin/docker/commit/b5305971ba5ecf18b47611ff3cf7e832... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .travis.yml A testing/wait-for-testing.sh Log Message: ----------- Verify test result from docker-compose.testing.yml Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 6736b49f7a96c031b710a2f13c48242ca855e348 https://github.com/phpmyadmin/docker/commit/6736b49f7a96c031b710a2f13c48242c... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/wait-for-testing.sh Log Message: ----------- Fix expression calculation Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 61bc237761b58ab44baece1659462efac6208fc3 https://github.com/phpmyadmin/docker/commit/61bc237761b58ab44baece1659462efa... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .travis.yml Log Message: ----------- Document this is supposed to fail right now Signed-off-by: Michal Čihař <michal@cihar.com> Commit: a2782dd8f6d694651a126e57db6339debf26f235 https://github.com/phpmyadmin/docker/commit/a2782dd8f6d694651a126e57db6339de... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/phpmyadmin_test.py Log Message: ----------- Detect correct path to sql file Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 63fd59434eb9e00ec3de940610b7378f2b9876ce https://github.com/phpmyadmin/docker/commit/63fd59434eb9e00ec3de940610b7378f... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/wait-for-testing.sh Log Message: ----------- Display logs on timeout Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 6314b17ebd0f043f4fca319bb3a37ba58db8dd6d https://github.com/phpmyadmin/docker/commit/6314b17ebd0f043f4fca319bb3a37ba5... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/wait-for-testing.sh Log Message: ----------- Need more time to run tests Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 70b6297233aacc8cf61ae2488bb474473aa7d463 https://github.com/phpmyadmin/docker/commit/70b6297233aacc8cf61ae2488bb47447... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .travis.yml Log Message: ----------- Fix path to testing configuration Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 382f9b9489bbe312073472b63f4eeb01f9b412de https://github.com/phpmyadmin/docker/commit/382f9b9489bbe312073472b63f4eeb01... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/wait-for-testing.sh Log Message: ----------- better progress reporting Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 5646cff98e44e3362df4bf3818ab0c1d679453b0 https://github.com/phpmyadmin/docker/commit/5646cff98e44e3362df4bf3818ab0c1d... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/wait-for-testing.sh Log Message: ----------- Do not report retries This is expected to take some time... Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 554e98df45a52d5b385cc260acb31bb9ac0aaf77 https://github.com/phpmyadmin/docker/commit/554e98df45a52d5b385cc260acb31bb9... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M .travis.yml A docker-compose.db.yml Log Message: ----------- Add dabase server link to docker-compose Signed-off-by: Michal Čihař <michal@cihar.com> Commit: c76721ba8b326402d45df07c45f8366991ac12f9 https://github.com/phpmyadmin/docker/commit/c76721ba8b326402d45df07c45f83669... Author: Michal Čihař <michal@cihar.com> Date: 2017-03-28 (Tue, 28 Mar 2017) Changed paths: M testing/wait-for-testing.sh Log Message: ----------- Fix typo Signed-off-by: Michal Čihař <michal@cihar.com> Compare: https://github.com/phpmyadmin/docker/compare/0ac5c9516c49...c76721ba8b32