Skip to content

Commit d2f873c

Browse files
choongemblaschke
authored andcommitted
Fix blackfire-agent daemon startup (#121)
* Add eval to blackfire-agent startup to make bash expand the args variable * Create directory for blackfire unix socket
1 parent c04954e commit d2f873c

File tree

40 files changed

+160
-40
lines changed

40 files changed

+160
-40
lines changed

docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/blackfire-agent.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
1717
BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
1818
fi
1919

20-
exec blackfire-agent $BLACKFIRE_ARGS
20+
# create directory for unix socket
21+
mkdir -p /var/run/blackfire
22+
23+
eval exec blackfire-agent $BLACKFIRE_ARGS

docker/php-apache-dev/alpine-3/conf/bin/service.d/blackfire-agent.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
1717
BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
1818
fi
1919

20-
exec blackfire-agent $BLACKFIRE_ARGS
20+
# create directory for unix socket
21+
mkdir -p /var/run/blackfire
22+
23+
eval exec blackfire-agent $BLACKFIRE_ARGS

docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
1717
BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
1818
fi
1919

20-
exec blackfire-agent $BLACKFIRE_ARGS
20+
# create directory for unix socket
21+
mkdir -p /var/run/blackfire
22+
23+
eval exec blackfire-agent $BLACKFIRE_ARGS

docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
1717
BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
1818
fi
1919

20-
exec blackfire-agent $BLACKFIRE_ARGS
20+
# create directory for unix socket
21+
mkdir -p /var/run/blackfire
22+
23+
eval exec blackfire-agent $BLACKFIRE_ARGS

docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
1717
BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
1818
fi
1919

20-
exec blackfire-agent $BLACKFIRE_ARGS
20+
# create directory for unix socket
21+
mkdir -p /var/run/blackfire
22+
23+
eval exec blackfire-agent $BLACKFIRE_ARGS

docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
1717
BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
1818
fi
1919

20-
exec blackfire-agent $BLACKFIRE_ARGS
20+
# create directory for unix socket
21+
mkdir -p /var/run/blackfire
22+
23+
eval exec blackfire-agent $BLACKFIRE_ARGS

docker/php-apache-dev/debian-8/conf/bin/service.d/blackfire-agent.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
1717
BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
1818
fi
1919

20-
exec blackfire-agent $BLACKFIRE_ARGS
20+
# create directory for unix socket
21+
mkdir -p /var/run/blackfire
22+
23+
eval exec blackfire-agent $BLACKFIRE_ARGS

docker/php-apache-dev/debian-9/conf/bin/service.d/blackfire-agent.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
1717
BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
1818
fi
1919

20-
exec blackfire-agent $BLACKFIRE_ARGS
20+
# create directory for unix socket
21+
mkdir -p /var/run/blackfire
22+
23+
eval exec blackfire-agent $BLACKFIRE_ARGS

docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/blackfire-agent.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
1717
BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
1818
fi
1919

20-
exec blackfire-agent $BLACKFIRE_ARGS
20+
# create directory for unix socket
21+
mkdir -p /var/run/blackfire
22+
23+
eval exec blackfire-agent $BLACKFIRE_ARGS

docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/blackfire-agent.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ if [[ -n "${BLACKFIRE_SERVER_TOKEN+x}" ]]; then
1717
BLACKFIRE_ARGS="$BLACKFIRE_ARGS --server-token=\"${BLACKFIRE_SERVER_TOKEN}\""
1818
fi
1919

20-
exec blackfire-agent $BLACKFIRE_ARGS
20+
# create directory for unix socket
21+
mkdir -p /var/run/blackfire
22+
23+
eval exec blackfire-agent $BLACKFIRE_ARGS

0 commit comments

Comments
 (0)