[phpMyAdmin Git] [phpmyadmin/docker] bf6422: Fix .gitignore, README.md and .travis.yml

[Mandy Schoep]

Branch: refs/heads/master
Home: https://github.com/phpmyadmin/docker
Commit: bf6422b6a64dca18322cf88ff0106690200dca5d
https://github.com/phpmyadmin/docker/commit/bf6422b6a64dca18322cf88ff0106690200dca5d
Author: Mandy Schoep <mandyschoep at gmail.com>
Date: 2019-12-24 (Tue, 12 December 2019) +01:00

Changed paths: 
M .gitignore
M .travis.yml
M README.md

Log Message:
-----------
Fix .gitignore, README.md and .travis.yml

Commit: 2576eb2c26ba446906a0103d4550f999aefa973c
https://github.com/phpmyadmin/docker/commit/2576eb2c26ba446906a0103d4550f999aefa973c
Author: Mandy Schoep <mandyschoep at gmail.com>
Date: 2019-12-24 (Tue, 12 December 2019) +01:00

Changed paths: 
M docker-entrypoint.sh

Log Message:
-----------
Implement loading secrets from files

Commit: 05d5c516d3640bac12cfef8a9a214bbcdc392755
https://github.com/phpmyadmin/docker/commit/05d5c516d3640bac12cfef8a9a214bbcdc392755
Author: Mandy Schoep <mandyschoep at gmail.com>
Date: 2019-12-24 (Tue, 12 December 2019) +01:00

Changed paths: 
A testing/conftest.py
M Makefile
M docker-compose.testing.yml
M testing/Dockerfile
M testing/phpmyadmin_test.py
M testing/test-docker.sh

Log Message:
-----------
Fix and improve test suite

Commit: 60e766aa9ebad0f9710c433175cb47aac46fea6d
https://github.com/phpmyadmin/docker/commit/60e766aa9ebad0f9710c433175cb47aac46fea6d
Author: Mandy Schoep <mandyschoep at gmail.com>
Date: 2019-12-26 (Thu, 12 December 2019) +01:00

Changed paths: 
M docker-entrypoint.sh
M testing/phpmyadmin_test.py

Log Message:
-----------
Added support for PMA_HOST_FILE and PMA_HOSTS_FILE

Commit: 568e58cc53def8d68f062dd6ddf4cab4d5bacb9c
https://github.com/phpmyadmin/docker/commit/568e58cc53def8d68f062dd6ddf4cab4d5bacb9c
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-12-26 (Thu, 12 December 2019) +01:00

Changed paths: 
A testing/conftest.py
M .gitignore
M .travis.yml
M Makefile
M README.md
M apache/docker-entrypoint.sh
M docker-compose.testing.yml
M docker-entrypoint.sh
M fpm-alpine/docker-entrypoint.sh
M fpm/docker-entrypoint.sh
M testing/Dockerfile
M testing/phpmyadmin_test.py
M testing/test-docker.sh

Log Message:
-----------
Merge #247 - Implement *_FILE read ENV from file

Pull-request: #247
Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: dd2ca51984e3ca0f7846af3c83d91cab3806c928
https://github.com/phpmyadmin/docker/commit/dd2ca51984e3ca0f7846af3c83d91cab3806c928
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-12-26 (Thu, 12 December 2019) +01:00

Changed paths: 
M apache/docker-entrypoint.sh
M fpm-alpine/docker-entrypoint.sh
M fpm/docker-entrypoint.sh

Log Message:
-----------
Update files after 2313c19aed350158176f7c5725d89df065c2b425 (#247)

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: b295aa6bf722a5e95d4b4b185e367e9a2d9c5916
https://github.com/phpmyadmin/docker/commit/b295aa6bf722a5e95d4b4b185e367e9a2d9c5916
Author: William Desportes <williamdes at wdes.fr>
Date: 2019-12-26 (Thu, 12 December 2019) +01:00

Changed paths: 
M README.md
M apache/docker-entrypoint.sh
M docker-entrypoint.sh
M fpm-alpine/docker-entrypoint.sh
M fpm/docker-entrypoint.sh
M testing/phpmyadmin_test.py

Log Message:
-----------
Improve README and fix PMA_HOSTS and PMA_HOST

Signed-off-by: William Desportes <williamdes at wdes.fr>