From 0a144bf3b4837fbc2eb9eceb12c8a626d909176f Mon Sep 17 00:00:00 2001
From: Choong Wei Tjeng <choong@bixels.nl>
Date: Sun, 24 Jul 2016 11:51:21 +0200
Subject: [PATCH 1/2] Add eval to blackfire-agent startup to make bash expand
 the args variable

---
 .../alpine-3-php7/conf/bin/service.d/blackfire-agent.sh         | 2 +-
 .../alpine-3/conf/bin/service.d/blackfire-agent.sh              | 2 +-
 .../centos-7-php56/conf/bin/service.d/blackfire-agent.sh        | 2 +-
 .../centos-7/conf/bin/service.d/blackfire-agent.sh              | 2 +-
 .../debian-7/conf/bin/service.d/blackfire-agent.sh              | 2 +-
 .../debian-8-php7/conf/bin/service.d/blackfire-agent.sh         | 2 +-
 .../debian-8/conf/bin/service.d/blackfire-agent.sh              | 2 +-
 .../debian-9/conf/bin/service.d/blackfire-agent.sh              | 2 +-
 .../ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh          | 2 +-
 .../ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh          | 2 +-
 .../ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh          | 2 +-
 .../ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh          | 2 +-
 .../ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh          | 2 +-
 .../php-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh | 2 +-
 docker/php-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh   | 2 +-
 .../centos-7-php56/conf/bin/service.d/blackfire-agent.sh        | 2 +-
 docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.sh   | 2 +-
 docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.sh   | 2 +-
 .../php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh | 2 +-
 docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.sh   | 2 +-
 docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.sh   | 2 +-
 .../php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh  | 2 +-
 .../php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh  | 2 +-
 .../php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh  | 2 +-
 .../php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh  | 2 +-
 .../php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh  | 2 +-
 .../alpine-3-php7/conf/bin/service.d/blackfire-agent.sh         | 2 +-
 .../alpine-3/conf/bin/service.d/blackfire-agent.sh              | 2 +-
 .../centos-7-php56/conf/bin/service.d/blackfire-agent.sh        | 2 +-
 .../centos-7/conf/bin/service.d/blackfire-agent.sh              | 2 +-
 .../debian-7/conf/bin/service.d/blackfire-agent.sh              | 2 +-
 .../debian-8-php7/conf/bin/service.d/blackfire-agent.sh         | 2 +-
 .../debian-8/conf/bin/service.d/blackfire-agent.sh              | 2 +-
 .../debian-9/conf/bin/service.d/blackfire-agent.sh              | 2 +-
 .../ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh          | 2 +-
 .../ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh          | 2 +-
 .../ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh          | 2 +-
 .../ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh          | 2 +-
 .../ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh          | 2 +-
 provisioning/php-dev/general/bin/service.d/blackfire-agent.sh   | 2 +-
 40 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-apache-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/provisioning/php-dev/general/bin/service.d/blackfire-agent.sh b/provisioning/php-dev/general/bin/service.d/blackfire-agent.sh
index fa60c64cb..a8ffa55cf 100644
--- a/provisioning/php-dev/general/bin/service.d/blackfire-agent.sh
+++ b/provisioning/php-dev/general/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,4 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
-exec blackfire-agent $BLACKFIRE_ARGS
+eval exec blackfire-agent $BLACKFIRE_ARGS

From b1c76f767c82ad6fd82ce488517aa60c19e8083d Mon Sep 17 00:00:00 2001
From: Choong Wei Tjeng <choong@bixels.nl>
Date: Sun, 24 Jul 2016 11:52:16 +0200
Subject: [PATCH 2/2] Create directory for blackfire unix socket

---
 .../alpine-3-php7/conf/bin/service.d/blackfire-agent.sh        | 3 +++
 .../alpine-3/conf/bin/service.d/blackfire-agent.sh             | 3 +++
 .../centos-7-php56/conf/bin/service.d/blackfire-agent.sh       | 3 +++
 .../centos-7/conf/bin/service.d/blackfire-agent.sh             | 3 +++
 .../debian-7/conf/bin/service.d/blackfire-agent.sh             | 3 +++
 .../debian-8-php7/conf/bin/service.d/blackfire-agent.sh        | 3 +++
 .../debian-8/conf/bin/service.d/blackfire-agent.sh             | 3 +++
 .../debian-9/conf/bin/service.d/blackfire-agent.sh             | 3 +++
 .../ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh         | 3 +++
 .../ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh         | 3 +++
 .../ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh         | 3 +++
 .../ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh         | 3 +++
 .../ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh         | 3 +++
 .../alpine-3-php7/conf/bin/service.d/blackfire-agent.sh        | 3 +++
 docker/php-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh  | 3 +++
 .../centos-7-php56/conf/bin/service.d/blackfire-agent.sh       | 3 +++
 docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.sh  | 3 +++
 docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.sh  | 3 +++
 .../debian-8-php7/conf/bin/service.d/blackfire-agent.sh        | 3 +++
 docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.sh  | 3 +++
 docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.sh  | 3 +++
 .../php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh | 3 +++
 .../php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh | 3 +++
 .../php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh | 3 +++
 .../php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh | 3 +++
 .../php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh | 3 +++
 .../alpine-3-php7/conf/bin/service.d/blackfire-agent.sh        | 3 +++
 .../alpine-3/conf/bin/service.d/blackfire-agent.sh             | 3 +++
 .../centos-7-php56/conf/bin/service.d/blackfire-agent.sh       | 3 +++
 .../centos-7/conf/bin/service.d/blackfire-agent.sh             | 3 +++
 .../debian-7/conf/bin/service.d/blackfire-agent.sh             | 3 +++
 .../debian-8-php7/conf/bin/service.d/blackfire-agent.sh        | 3 +++
 .../debian-8/conf/bin/service.d/blackfire-agent.sh             | 3 +++
 .../debian-9/conf/bin/service.d/blackfire-agent.sh             | 3 +++
 .../ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh         | 3 +++
 .../ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh         | 3 +++
 .../ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh         | 3 +++
 .../ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh         | 3 +++
 .../ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh         | 3 +++
 provisioning/php-dev/general/bin/service.d/blackfire-agent.sh  | 3 +++
 40 files changed, 120 insertions(+)

diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-apache-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/centos-7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/debian-7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/debian-8/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/debian-9/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
+++ b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS
diff --git a/provisioning/php-dev/general/bin/service.d/blackfire-agent.sh b/provisioning/php-dev/general/bin/service.d/blackfire-agent.sh
index a8ffa55cf..fbec23cf3 100644
--- a/provisioning/php-dev/general/bin/service.d/blackfire-agent.sh
+++ b/provisioning/php-dev/general/bin/service.d/blackfire-agent.sh
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
     BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
 fi
 
+# create directory for unix socket
+mkdir -p /var/run/blackfire
+
 eval exec blackfire-agent $BLACKFIRE_ARGS