ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2025-06-19 15:43:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

DVL-001 Prepare HHVM support

Browse Source
This commit is contained in:
cytopia
2017-04-19 19:48:44 +02:00
parent 294123505b
commit d396c921d7
20 changed files with 1447 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
.devilbox/www/config.php
View File

@ -42,23 +42,51 @@ $MYSQL_HOST_ADDR = gethostbyname($MYSQL_HOST_NAME);
$POSTGRES_HOST_NAME = 'postgres';
$POSTGRES_HOST_ADDR = gethostbyname($POSTGRES_HOST_NAME);
//
// Lazy Loader
//
function loadClass($class) {
//
// Load files
//
require $LIB_DIR . DIRECTORY_SEPARATOR . 'Logger.php';
require $LIB_DIR . DIRECTORY_SEPARATOR . 'Docker.php';
require $LIB_DIR . DIRECTORY_SEPARATOR . 'Mysql.php';
require $LIB_DIR . DIRECTORY_SEPARATOR . 'Postgres.php';
global $LIB_DIR;
global $MYSQL_HOST_ADDR;
global $POSTGRES_HOST_ADDR;
static $_LOADED_LIBS;
//
// Instantiate Basics
//
$Logger = \devilbox\Logger::getInstance();
$Docker = \devilbox\Docker::getInstance();
$MySQL = \devilbox\Mysql::getInstance('root', $Docker->getEnv('MYSQL_ROOT_PASSWORD'), $MYSQL_HOST_ADDR);
$Postgres = \devilbox\Postgres::getInstance($Docker->getEnv('POSTGRES_USER'), $Docker->getEnv('POSTGRES_PASSWORD'), $POSTGRES_HOST_ADDR);
if (isset($_LOADED_LIBS[$class])) {
return $_LOADED_LIBS[$class];
} else {
switch($class) {
case 'Logger':
require $LIB_DIR . DIRECTORY_SEPARATOR . $class . '.php';
$_LOADED_LIBS[$class] = \devilbox\Logger::getInstance();
break;
case 'Docker':
require $LIB_DIR . DIRECTORY_SEPARATOR . $class . '.php';
$_LOADED_LIBS[$class] = \devilbox\Docker::getInstance();
break;
case 'Mysql':
require $LIB_DIR . DIRECTORY_SEPARATOR . $class . '.php';
$Docker = loadClass('Docker');
$_LOADED_LIBS[$class] = \devilbox\Mysql::getInstance('root', $Docker->getEnv('MYSQL_ROOT_PASSWORD'), $MYSQL_HOST_ADDR);
break;
case 'Postgres':
require $LIB_DIR . DIRECTORY_SEPARATOR . $class . '.php';
$Docker = loadClass('Docker');
$_LOADED_LIBS[$class] = \devilbox\Postgres::getInstance($Docker->getEnv('POSTGRES_USER'), $Docker->getEnv('POSTGRES_PASSWORD'), $POSTGRES_HOST_ADDR);
break;
default:
exit('Class does not exist: '.$class);
}
return $_LOADED_LIBS[$class];
}
}

10
.devilbox/www/htdocs/_ajax_callback.php
View File

@ -4,16 +4,16 @@ require '../config.php';
if (isset($_GET['database'])) {
if (isset($_GET['type']) && $_GET['type'] == 'mysql') {
echo json_encode(array(
'size' => (string)$MySQL->getDBSize($_GET['database']),
'table' => (string)$MySQL->getTableCount($_GET['database'])
'size' => (string)loadClass('Mysql')->getDBSize($_GET['database']),
'table' => (string)loadClass('Mysql')->getTableCount($_GET['database'])
));
} else if (isset($_GET['type']) && $_GET['type'] == 'postgres') {
$schema = isset($_GET['schema']) ? $_GET['schema'] : '';
echo json_encode(array(
'size' => (string)$Postgres->getSchemaSize($_GET['database'], $schema),
'table' => (string)$Postgres->getTableCount($_GET['database'], $schema)
'size' => (string)loadClass('Postgres')->getSchemaSize($_GET['database'], $schema),
'table' => (string)loadClass('Postgres')->getTableCount($_GET['database'], $schema)
));
}
} else if (isset($_GET['vhost'])) {
echo $Docker->PHP_checkVirtualHost($_GET['vhost']);
echo loadClass('Docker')->PHP_checkVirtualHost($_GET['vhost']);
}

1
.devilbox/www/htdocs/db_mysql.php
View File

@ -1,4 +1,5 @@
<?php require '../config.php'; ?>
<?php $MySQL = loadClass('Mysql'); ?>
<!DOCTYPE html>
<html lang="en">
<head>

1
.devilbox/www/htdocs/db_postgres.php
View File

@ -1,4 +1,5 @@
<?php require '../config.php'; ?>
<?php $Postgres = loadClass('Postgres'); ?>
<!DOCTYPE html>
<html lang="en">
<head>

2
.devilbox/www/htdocs/debug.php
View File

@ -17,7 +17,7 @@
<div class="row">
<div class="col-md-12">
<?php $errors = $Logger->getAll(); ?>
<?php $errors = loadClass('Logger')->getAll(); ?>
<?php if ($errors === false): ?>
<p>Writing to logfile is not possible. Errors will be sent as mail instead. Check the mail section.</p>
<?php elseif (count($errors) === 0): ?>

11
.devilbox/www/htdocs/index.php
View File

@ -1,4 +1,5 @@
<?php require '../config.php'; ?>
<?php $Docker = loadClass('Docker'); ?>
<!DOCTYPE html>
<html lang="en">
<head>
@ -162,28 +163,28 @@
</td>
</tr>
<tr>
<?php $error; $valid = $Docker->PHP_has_valid_mysql_socket($error); ?>
<?php $err=null; $valid = $Docker->PHP_has_valid_mysql_socket($err); ?>
<th>MySQL socket</th>
<td class="<?php echo !$valid ? 'bg-danger' : '';?>">
<?php echo !$valid ? 'Error<br/><sub>'.$error.'</sub>' : $Docker->getEnv('MYSQL_SOCKET_PATH'); ?>
<?php echo !$valid ? 'Error<br/><sub>'.$err.'</sub>' : $Docker->getEnv('MYSQL_SOCKET_PATH'); ?>
</td>
</tr>
<tr>
<?php $err; $valid = \devilbox\Mysql::testConnection($err, 'root', $Docker->getEnv('MYSQL_ROOT_PASSWORD'), 'localhost'); ?>
<?php $err=null; $valid = \devilbox\Mysql::testConnection($err, 'root', $Docker->getEnv('MYSQL_ROOT_PASSWORD'), 'localhost'); ?>
<th>MySQL test</th>
<td class="<?php echo !$valid ? 'bg-danger' : '';?>">
<?php echo $valid ? '<span class="bg-success">OK</span> localhost:3306' : 'Failed: localhost:3306<br/><sub>'.$err.'</sub>'; ?>
</td>
</tr>
<tr>
<?php $err; $valid = \devilbox\Mysql::testConnection($err, 'root', $Docker->getEnv('MYSQL_ROOT_PASSWORD'), '127.0.0.1'); ?>
<?php $err=null; $valid = \devilbox\Mysql::testConnection($err, 'root', $Docker->getEnv('MYSQL_ROOT_PASSWORD'), '127.0.0.1'); ?>
<th>MySQL test</th>
<td class="<?php echo !$valid ? 'bg-danger' : '';?>">
<?php echo $valid ? '<span class="bg-success">OK</span> 127.0.0.1:3306' : 'Failed: 127.0.0.1:3306<br/><sub>'.$err.'</sub>'; ?>
</td>
</tr>
<tr>
<?php $err; $valid = \devilbox\Mysql::testConnection($err, 'root', $Docker->getEnv('MYSQL_ROOT_PASSWORD'), $MYSQL_HOST_ADDR); ?>
<?php $err=null; $valid = \devilbox\Mysql::testConnection($err, 'root', $Docker->getEnv('MYSQL_ROOT_PASSWORD'), $MYSQL_HOST_ADDR); ?>
<th>MySQL test</th>
<td class="<?php echo !$valid ? 'bg-danger' : '';?>">
<?php echo $valid ? '<span class="bg-success">OK</span> '.$MYSQL_HOST_ADDR.':3306' : 'Failed: '.$MYSQL_HOST_ADDR.':3306<br/><sub>'.$err.'</sub>'; ?>

6
.devilbox/www/htdocs/mail.php
View File

@ -1,4 +1,5 @@
<?php
require '../config.php';
//
// $_POST submit for sending a test email
@ -7,7 +8,9 @@ if (isset($_GET['email']) && isset($_GET['subject']) && isset($_GET['message']))
$mail = $_GET['email'];
$subj = $_GET['subject'];
$mess = $_GET['message'];
mail($mail, $subj, $mess);
if (! mail($mail, $subj, $mess)) {
loadClass('Logger')->error('Could not send mail to: '.$mail.' | subject: '.$subject);
}
header('Location: /mail.php');
exit();
}
@ -15,7 +18,6 @@ if (isset($_GET['email']) && isset($_GET['subject']) && isset($_GET['message']))
//
// Includes
//
require '../config.php';
require $VEN_DIR . DIRECTORY_SEPARATOR . 'Mail' . DIRECTORY_SEPARATOR .'Mbox.php';
require $VEN_DIR . DIRECTORY_SEPARATOR . 'Mail' . DIRECTORY_SEPARATOR .'mimeDecode.php';
require $LIB_DIR . DIRECTORY_SEPARATOR . 'Mail.php';

1
.devilbox/www/htdocs/mysqlinfo.php
View File

@ -1,4 +1,5 @@
<?php require '../config.php'; ?>
<?php $Docker = loadClass('Docker'); ?>
<!DOCTYPE html>
<html lang="en">
<head>

4
.devilbox/www/htdocs/phpinfo.php
View File

@ -12,6 +12,10 @@
<div class="row">
<div class="col-md-12">
<style>
/* prevent hhvm phpinfo() from shrinking the width */
body {width: 100% !important;}
</style>
<?php phpinfo(); ?>
</div>
</div>

1
.devilbox/www/htdocs/postgresinfo.php
View File

@ -1,4 +1,5 @@
<?php require '../config.php'; ?>
<?php $Docker = loadClass('Docker'); ?>
<!DOCTYPE html>
<html lang="en">
<head>

1
.devilbox/www/htdocs/vhosts.php
View File

@ -1,4 +1,5 @@
<?php require '../config.php'; ?>
<?php $Docker = loadClass('Docker'); ?>
<!DOCTYPE html>
<html lang="en">
<head>

18
.devilbox/www/include/lib/Docker.php
View File

@ -107,8 +107,7 @@ class Docker
public function getEnv($variable)
{
if (!isset($this->_env[$variable])) {
$Logger = \devilbox\Logger::getInstance();
$Logger->error('Docker environment variable not found: '.$variable);
loadClass('Logger')->error('Docker environment variable not found: '.$variable);
return null;
}
return $this->_env[$variable];
@ -158,8 +157,13 @@ class Docker
*/
public function PHP_version()
{
if (defined('HHVM_VERSION')) {
return 'HHVM ' .HHVM_VERSION . '<br/>(PHP '.str_replace('-hhvm', '', phpversion()).')';
//return 'PHP ' . phpversion() . '('. HHVM_VERSION . ')';
} else {
return 'PHP ' . phpversion() .' (' . php_sapi_name().')';
}
}
/**
* Read out PHP Server configuration by variable
@ -338,7 +342,7 @@ class Docker
};
$sql = 'SHOW VARIABLES;';
$configs = \devilbox\Mysql::getInstance()->select($sql, $callback);
$configs = loadClass('Mysql')->select($sql, $callback);
return $configs ? $configs : array();
@ -351,7 +355,7 @@ class Docker
};
$sql = 'SHOW VARIABLES WHERE Variable_Name = "'.$key.'";';
$val = \devilbox\Mysql::getInstance()->select($sql, $callback);
$val = loadClass('Mysql')->select($sql, $callback);
if (is_array($val) && $val) {
return array_values($val)[0];
@ -379,7 +383,7 @@ class Docker
$data = $row['version'];
};
$version = \devilbox\Postgres::getInstance()->select('SELECT version();', $callback);
$version = loadClass('Postgres')->select('SELECT version();', $callback);
// Extract shorthand
preg_match('/\w+[[:space:]]*[.0-9]+/i', $version, $matches);
@ -412,7 +416,7 @@ class Docker
};
$sql = 'SELECT name, setting FROM pg_settings;';
$configs = \devilbox\Postgres::getInstance()->select($sql, $callback);
$configs = loadClass('Postgres')->select($sql, $callback);
return $configs ? $configs : array();
@ -423,7 +427,7 @@ class Docker
};
$sql = "SELECT name, setting FROM pg_settings WHERE name = '".$key."';";
$val = \devilbox\Postgres::getInstance()->select($sql, $callback);
$val = loadClass('Postgres')->select($sql, $callback);
return is_array($val) ? '' : $val;
}

8
.devilbox/www/include/lib/Mysql.php
View File

@ -34,7 +34,7 @@ class Mysql
}
// If current MySQL instance was unable to connect
if ((static::$instance->getConnectError())) {
\devilbox\Logger::getInstance()->error('Instance has errors:' . "\r\n" . var_export(static::$instance, true) . "\r\n");
loadClass('Logger')->error('Instance has errors:' . "\r\n" . var_export(static::$instance, true) . "\r\n");
//return null;
}
return static::$instance;
@ -130,7 +130,7 @@ class Mysql
if (mysqli_connect_errno()) {
$this->_connect_error = 'Failed to connect: ' .mysqli_connect_error();
$this->_connect_errno = mysqli_connect_errno();
\devilbox\Logger::getInstance()->error($this->_connect_error);
loadClass('Logger')->error($this->_connect_error);
} else {
$this->_link = $link;
}
@ -162,14 +162,14 @@ class Mysql
public function select($query, $callback = null)
{
if (!$this->_link) {
\devilbox\Logger::getInstance()->error('MySQL error, link is no resource in select()');
loadClass('Logger')->error('MySQL error, link is no resource in select()');
return false;
}
if (!($result = mysqli_query($this->_link, $query))) {
$this->_error = mysqli_error($this->_link);
$this->_errno = mysqli_errno($this->_link);
\devilbox\Logger::getInstance()->error($this->_error);
loadClass('Logger')->error($this->_error);
return false;
}

14
.devilbox/www/include/lib/Postgres.php
View File

@ -34,7 +34,7 @@ class Postgres
}
// If current Postgres instance was unable to connect
if ((static::$instance->getConnectError())) {
\devilbox\Logger::getInstance()->error('Instance has errors:' . "\r\n" . var_export(static::$instance, true) . "\r\n");
loadClass('Logger')->error('Instance has errors:' . "\r\n" . var_export(static::$instance, true) . "\r\n");
//return null;
}
return static::$instance;
@ -135,7 +135,7 @@ class Postgres
if (!$link || pg_connection_status($link) !== PGSQL_CONNECTION_OK) {
$this->_connect_error = 'Failed to connect to '.$user.'@'.$host;
$this->_connect_errno = 1;
\devilbox\Logger::getInstance()->error($this->_connect_error);
loadClass('Logger')->error($this->_connect_error);
} else {
$this->_link = $link;
}
@ -171,14 +171,14 @@ class Postgres
public function select($query, $callback = null)
{
if (!$this->_link) {
\devilbox\Logger::getInstance()->error('Postgres error, link is no resource in select()');
loadClass('Logger')->error('Postgres error, link is no resource in select()');
return false;
}
if (!($result = pg_query($this->_link, $query))) {
$this->_error = 'PostgreSQL - error on result: '.pg_result_error($result)."\n" . 'query:'."\n" . $query;
$this->_errno = 1;
\devilbox\Logger::getInstance()->error($this->_error);
loadClass('Logger')->error($this->_error);
return false;
}
@ -224,7 +224,7 @@ class Postgres
// Get schemas for each database
foreach ($databases as $name => &$database) {
$PSQL = new Postgres('postgres', \devilbox\Docker::getInstance()->getEnv('POSTGRES_PASSWORD'), $GLOBALS['POSTGRES_HOST_ADDR'], $name);
$PSQL = new Postgres('postgres', loadClass('Docker')->getEnv('POSTGRES_PASSWORD'), $GLOBALS['POSTGRES_HOST_ADDR'], $name);
$sql = "SELECT n.nspname AS schemas FROM pg_catalog.pg_namespace AS n WHERE n.nspname !~ '^pg_' AND n.nspname <> 'information_schema';";
$callback = function ($row, &$data) {
@ -247,7 +247,7 @@ class Postgres
*/
public function getSchemaSize($database, $schema)
{
$PSQL = new Postgres('postgres', \devilbox\Docker::getInstance()->getEnv('POSTGRES_PASSWORD'), $GLOBALS['POSTGRES_HOST_ADDR'], $database);
$PSQL = new Postgres('postgres', loadClass('Docker')->getEnv('POSTGRES_PASSWORD'), $GLOBALS['POSTGRES_HOST_ADDR'], $database);
$callback = function ($row, &$data) {
$data = $row['size'];
@ -276,7 +276,7 @@ class Postgres
*/
public function getTableCount($database, $schema)
{
$PSQL = new Postgres('postgres', \devilbox\Docker::getInstance()->getEnv('POSTGRES_PASSWORD'), $GLOBALS['POSTGRES_HOST_ADDR'], $database);
$PSQL = new Postgres('postgres', loadClass('Docker')->getEnv('POSTGRES_PASSWORD'), $GLOBALS['POSTGRES_HOST_ADDR'], $database);
$callback = function ($row, &$data) {
$data = $row['count'];
};

1112
.devilbox/www/include/vendor/Mail/PEAR.php vendored Normal file
View File

File diff suppressed because it is too large Load Diff

1
.gitignore vendored
View File

@ -31,6 +31,7 @@ cfg/php-fpm-5.5/*.ini
cfg/php-fpm-5.6/*.ini
cfg/php-fpm-7.0/*.ini
cfg/php-fpm-7.1/*.ini
cfg/hhvm-latest/*.ini

9
.travis.yml
View File

@ -40,6 +40,7 @@ env:
- SERVER=php VERSION=php-fpm-5.6
- SERVER=php VERSION=php-fpm-7.0
- SERVER=php VERSION=php-fpm-7.1
- SERVER=php VERSION=hhvm-latest
###
@ -54,6 +55,14 @@ before_install:
- uname -a
before_script:
# Disable services enabled by default
# http://docs.travis-ci.com/user/database-setup/#MySQL
- sudo /etc/init.d/mysql stop
- sudo /etc/init.d/postgresql stop
###
### Test
###

12
README.md
View File

@ -79,12 +79,12 @@ No need to install and configure different versions locally. Simply choose your
| Webserver | MySQL | PostgreSQL | PHP |
|-----------|-------|------------|-----|
| [![Build Status](https://travis-ci.org/cytopia/docker-apache-2.2.svg?branch=master)](https://travis-ci.org/cytopia/docker-apache-2.2) [Apache 2.2](https://github.com/cytopia/docker-apache-2.2) | [![Build Status](https://travis-ci.org/cytopia/docker-mysql-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-5.5) [MySQL 5.5](https://github.com/cytopia/docker-mysql-5.5) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PostgreSQL 9.2](https://hub.docker.com/_/postgres/) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.4.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.4) [PHP 5.4](https://github.com/cytopia/docker-php-fpm-5.4) |
| [![Build Status](https://travis-ci.org/cytopia/docker-apache-2.4.svg?branch=master)](https://travis-ci.org/cytopia/docker-apache-2.4) [Apache 2.4](https://github.com/cytopia/docker-apache-2.4) | [![Build Status](https://travis-ci.org/cytopia/docker-mysql-5.6.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-5.6) [MySQL 5.6](https://github.com/cytopia/docker-mysql-5.6) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PostgreSQL 9.3](https://hub.docker.com/_/postgres/) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.5) [PHP 5.5](https://github.com/cytopia/docker-php-fpm-5.5) |
| [![Build Status](https://travis-ci.org/cytopia/docker-nginx-stable.svg?branch=master)](https://travis-ci.org/cytopia/docker-nginx-stable) [Nginx stable](https://github.com/cytopia/docker-nginx-stable) | [![Build Status](https://travis-ci.org/cytopia/docker-mysql-5.7.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-5.7) [MySQL 5.7](https://github.com/cytopia/docker-mysql-5.7) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PostgreSQL 9.4](https://hub.docker.com/_/postgres/) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.6.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.6) [PHP 5.6](https://github.com/cytopia/docker-php-fpm-5.6) |
| [![Build Status](https://travis-ci.org/cytopia/docker-nginx-mainline.svg?branch=master)](https://travis-ci.org/cytopia/docker-nginx-mainline) [Nginx mainline](https://github.com/cytopia/docker-nginx-mainline) | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-5.5) [MariaDB 5.5](https://github.com/cytopia/docker-mariadb-5.5) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PostgreSQL 9.5](https://hub.docker.com/_/postgres/) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.0.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.0) [PHP 7.0](https://github.com/cytopia/docker-php-fpm-7.0) |
| | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.0.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.0) [MariaDB 10.0](https://github.com/cytopia/docker-mariadb-10.0) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PostgreSQL 9.6](https://hub.docker.com/_/postgres/) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.1.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.1) [PHP 7.1](https://github.com/cytopia/docker-php-fpm-7.1) |
| | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.1.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.1) [MariaDB 10.1](https://github.com/cytopia/docker-mariadb-10.1) | |
| [![Build Status](https://travis-ci.org/cytopia/docker-apache-2.2.svg?branch=master)](https://travis-ci.org/cytopia/docker-apache-2.2) [Apache 2.2](https://github.com/cytopia/docker-apache-2.2) | [![Build Status](https://travis-ci.org/cytopia/docker-mysql-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-5.5) [MySQL 5.5](https://github.com/cytopia/docker-mysql-5.5) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.2](https://hub.docker.com/_/postgres/) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.4.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.4) [PHP 5.4](https://github.com/cytopia/docker-php-fpm-5.4) |
| [![Build Status](https://travis-ci.org/cytopia/docker-apache-2.4.svg?branch=master)](https://travis-ci.org/cytopia/docker-apache-2.4) [Apache 2.4](https://github.com/cytopia/docker-apache-2.4) | [![Build Status](https://travis-ci.org/cytopia/docker-mysql-5.6.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-5.6) [MySQL 5.6](https://github.com/cytopia/docker-mysql-5.6) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.3](https://hub.docker.com/_/postgres/) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.5) [PHP 5.5](https://github.com/cytopia/docker-php-fpm-5.5) |
| [![Build Status](https://travis-ci.org/cytopia/docker-nginx-stable.svg?branch=master)](https://travis-ci.org/cytopia/docker-nginx-stable) [Nginx stable](https://github.com/cytopia/docker-nginx-stable) | [![Build Status](https://travis-ci.org/cytopia/docker-mysql-5.7.svg?branch=master)](https://travis-ci.org/cytopia/docker-mysql-5.7) [MySQL 5.7](https://github.com/cytopia/docker-mysql-5.7) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.4](https://hub.docker.com/_/postgres/) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-5.6.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-5.6) [PHP 5.6](https://github.com/cytopia/docker-php-fpm-5.6) |
| [![Build Status](https://travis-ci.org/cytopia/docker-nginx-mainline.svg?branch=master)](https://travis-ci.org/cytopia/docker-nginx-mainline) [Nginx mainline](https://github.com/cytopia/docker-nginx-mainline) | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-5.5.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-5.5) [MariaDB 5.5](https://github.com/cytopia/docker-mariadb-5.5) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.5](https://hub.docker.com/_/postgres/) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.0.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.0) [PHP 7.0](https://github.com/cytopia/docker-php-fpm-7.0) |
| | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.0.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.0) [MariaDB 10.0](https://github.com/cytopia/docker-mariadb-10.0) | [![Build Status](https://travis-ci.org/docker-library/postgres.svg?branch=master)](https://travis-ci.org/docker-library/postgres/branches) [PgSQL 9.6](https://hub.docker.com/_/postgres/) | [![Build Status](https://travis-ci.org/cytopia/docker-php-fpm-7.1.svg?branch=master)](https://travis-ci.org/cytopia/docker-php-fpm-7.1) [PHP 7.1](https://github.com/cytopia/docker-php-fpm-7.1) |
| | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.1.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.1) [MariaDB 10.1](https://github.com/cytopia/docker-mariadb-10.1) | | [![Build Status](https://travis-ci.org/cytopia/docker-hhvm-latest.svg?branch=master)](https://travis-ci.org/cytopia/docker-hhvm-latest) [HHVM latest](https://github.com/cytopia/docker-hhvm-latest)
| | [![Build Status](https://travis-ci.org/cytopia/docker-mariadb-10.2.svg?branch=master)](https://travis-ci.org/cytopia/docker-mariadb-10.2) [MariaDB 10.2](https://github.com/cytopia/docker-mariadb-10.2) | |

6
docker-compose.yml
View File

@ -30,7 +30,7 @@ services:
# HTTP
# ----------------------------------------
httpd:
image: cytopia/${HTTPD_SERVER}:0.8
image: cytopia/${HTTPD_SERVER}:latest
# Manually build via `docker-compose build`
#build:
@ -97,7 +97,6 @@ services:
- "php:php-fpm"
# ----------------------------------------
# PHP-FPM
# ----------------------------------------
@ -203,12 +202,11 @@ services:
- "postgres:postgresql"
# ----------------------------------------
# DATABASE
# ----------------------------------------
mysql:
image: cytopia/${MYSQL_SERVER}:0.8
image: cytopia/${MYSQL_SERVER}:latest
# Manually build via `docker-compose build`
#build:

5
env-example
View File

@ -15,7 +15,7 @@
###
### 1: Yes
### 0: No
DEBUG_COMPOSE_ENTRYPOINT=0
DEBUG_COMPOSE_ENTRYPOINT=1
@ -96,8 +96,7 @@ POSTGRES_SERVER=9.6
#PHP_SERVER=php-fpm-5.6
PHP_SERVER=php-fpm-7.0
#PHP_SERVER=php-fpm-7.1
#PHP_SERVER=hhvm-3
#PHP_SERVER=hhvm-latest
###