From beee1177f867eae17216aa1fbcd4abb9a0de9158 Mon Sep 17 00:00:00 2001
From: Tobias Munk <schmunk@usrbin.de>
Date: Tue, 8 Sep 2015 17:44:13 +0200
Subject: [PATCH 1/2] use values from linked container

---
 php-fpm/psm_config.php         | 8 ++++----
 php-fpm/psm_config.php.default | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/php-fpm/psm_config.php b/php-fpm/psm_config.php
index 4a897e1..3c25d90 100644
--- a/php-fpm/psm_config.php
+++ b/php-fpm/psm_config.php
@@ -1,6 +1,6 @@
 <?php
-define('PSM_DB_HOST', 'mysqlpsm');
-define('PSM_DB_NAME', 'phpservermon');
-define('PSM_DB_USER', 'phpservermon');
-define('PSM_DB_PASS', 'phpservermon');
+define('PSM_DB_HOST', getenv('MYSQLPSM_PORT_3306_TCP_ADDR'));
+define('PSM_DB_NAME', getenv('MYSQLPSM_ENV_MYSQL_DATABASE'));
+define('PSM_DB_USER', getenv('MYSQLPSM_ENV_MYSQL_USER'));
+define('PSM_DB_PASS', getenv('MYSQLPSM_ENV_MYSQL_PASSWORD'));
 define('PSM_DB_PREFIX', 'psm_');
diff --git a/php-fpm/psm_config.php.default b/php-fpm/psm_config.php.default
index 4a897e1..3c25d90 100644
--- a/php-fpm/psm_config.php.default
+++ b/php-fpm/psm_config.php.default
@@ -1,6 +1,6 @@
 <?php
-define('PSM_DB_HOST', 'mysqlpsm');
-define('PSM_DB_NAME', 'phpservermon');
-define('PSM_DB_USER', 'phpservermon');
-define('PSM_DB_PASS', 'phpservermon');
+define('PSM_DB_HOST', getenv('MYSQLPSM_PORT_3306_TCP_ADDR'));
+define('PSM_DB_NAME', getenv('MYSQLPSM_ENV_MYSQL_DATABASE'));
+define('PSM_DB_USER', getenv('MYSQLPSM_ENV_MYSQL_USER'));
+define('PSM_DB_PASS', getenv('MYSQLPSM_ENV_MYSQL_PASSWORD'));
 define('PSM_DB_PREFIX', 'psm_');

From 4ccc8e869bb800e44631ae53453805ff9bd4879d Mon Sep 17 00:00:00 2001
From: Tobias Munk <schmunk@usrbin.de>
Date: Tue, 8 Sep 2015 17:45:49 +0200
Subject: [PATCH 2/2] updated container setup  - build from folder  - expose
 db-port

---
 docker-compose.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f558ff7..fe601e7 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ web:
       - php
 
 php:
-  image: temp/php-fpm-psm:0.0.0
+  build: php-fpm
   links:
     - db:mysqlpsm
 
@@ -23,3 +23,5 @@ db:
    - MYSQL_DATABASE=phpservermon
    - MYSQL_USER=phpservermon
    - MYSQL_PASSWORD=phpservermon
+  expose:
+   - 3306