[phpMyAdmin Git] [phpmyadmin/docker] d70630: Initial attempt to use nginx + php-fpm

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/docker
  Commit: d70630f09a03710d02185d9da2957f134c8032a9
      https://github.com/phpmyadmin/docker/commit/d70630f09a03710d02185d9da2957f134c8032a9
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-08-27 (Sat, 27 Aug 2016)

  Changed paths:
    M .travis.yml
    M Dockerfile
    A etc/nginx.conf
    A etc/php-fpm.conf
    A etc/supervisor.d/nginx.ini
    A etc/supervisor.d/php.ini
    M run.sh

  Log Message:
  -----------
  Initial attempt to use nginx + php-fpm

Replaced php built in server with supervisord + nginx + php-fpm.

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 5cb63716a7c7b9baae2b385ce66ee59c3dfc7db3
      https://github.com/phpmyadmin/docker/commit/5cb63716a7c7b9baae2b385ce66ee59c3dfc7db3
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-08-27 (Sat, 27 Aug 2016)

  Changed paths:
    M .travis.yml
    A test-docker.sh

  Log Message:
  -----------
  Move tests to separate script

We repeat same for every container anyway.

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 1b2ff909416149071d20fc6355b61229c2f48ec4
      https://github.com/phpmyadmin/docker/commit/1b2ff909416149071d20fc6355b61229c2f48ec4
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-08-27 (Sat, 27 Aug 2016)

  Changed paths:
    M .travis.yml
    M docker-compose.yml

  Log Message:
  -----------
  Better name for docker-compose

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: b611c5adde296d26db0cc58589968f6dcfca42c6
      https://github.com/phpmyadmin/docker/commit/b611c5adde296d26db0cc58589968f6dcfca42c6
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-08-27 (Sat, 27 Aug 2016)

  Changed paths:
    M test-docker.sh

  Log Message:
  -----------
  Display logs at the end of test

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 00ff178fd1ca03c6439a87477ba2485ca77cf23b
      https://github.com/phpmyadmin/docker/commit/00ff178fd1ca03c6439a87477ba2485ca77cf23b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-08-28 (Sun, 28 Aug 2016)

  Changed paths:
    A etc/php.ini
    M etc/supervisor.d/php.ini

  Log Message:
  -----------
  Add php.ini configuration file

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: d12c0493eea16073755f24029e709549c63839f6
      https://github.com/phpmyadmin/docker/commit/d12c0493eea16073755f24029e709549c63839f6
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-08-28 (Sun, 28 Aug 2016)

  Changed paths:
    M etc/php.ini

  Log Message:
  -----------
  Improve sessions configuration

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: feb1c925815745674fa83232e4934a3e7e0c8c3f
      https://github.com/phpmyadmin/docker/commit/feb1c925815745674fa83232e4934a3e7e0c8c3f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-08-28 (Sun, 28 Aug 2016)

  Changed paths:
    M Dockerfile

  Log Message:
  -----------
  Remove debugging settings

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 507105ec7058591095c5dcef2e4042d2d91d0748
      https://github.com/phpmyadmin/docker/commit/507105ec7058591095c5dcef2e4042d2d91d0748
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-08-28 (Sun, 28 Aug 2016)

  Changed paths:
    M .travis.yml
    M Dockerfile
    M docker-compose.yml
    A etc/nginx.conf
    A etc/php-fpm.conf
    A etc/php.ini
    A etc/supervisor.d/nginx.ini
    A etc/supervisor.d/php.ini
    M run.sh
    A test-docker.sh

  Log Message:
  -----------
  Merge pull request #48 from nijel/nginx

Use supervisor +  nginx + php-fpm


Compare: https://github.com/phpmyadmin/docker/compare/9e0529c6f500...507105ec7058