robin/haze
1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-03 17:14:08 +02:00
Code Issues Projects Releases Wiki Activity

run blackfire agent in container

Browse source
This commit is contained in:
Robin Appelman 2022-03-16 17:45:53 +01:00
commit 777213946d
4 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
images/haze/Dockerfile
View file

@ -29,6 +29,12 @@ RUN DEBIAN_FRONTEND=noninteractive ;\
wget https://github.com/vimeo/psalm/releases/latest/download/psalm.phar -O /usr/local/bin/psalm && \ wget https://github.com/vimeo/psalm/releases/latest/download/psalm.phar -O /usr/local/bin/psalm && \
chmod +x /usr/local/bin/psalm chmod +x /usr/local/bin/psalm
RUN DEBIAN_FRONTEND=noninteractive ;\
wget -q -O - https://packages.blackfire.io/gpg.key | apt-key add - && \
echo "deb http://packages.blackfire.io/debian any main" >> /etc/apt/sources.list.d/blackfire.list && \
apt-get update && \
apt-get install --assume-yes blackfire procps ncat
ADD configs/autoconfig_mariadb.php configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/s3.php configs/s3mb.php configs/swift.php configs/swiftv3.php configs/azure.php configs/config.php /root/ ADD configs/autoconfig_mariadb.php configs/autoconfig_mysql.php configs/autoconfig_pgsql.php configs/autoconfig_oci.php configs/s3.php configs/s3mb.php configs/swift.php configs/swiftv3.php configs/azure.php configs/config.php /root/
ADD configs/nginx-app.conf /etc/nginx/ ADD configs/nginx-app.conf /etc/nginx/

7
images/haze/misc/bootstrap.sh
View file

@ -65,6 +65,13 @@ then
sed -i '/\/\/PLACEHOLDER/ r /root/azure.php' /var/www/html/config/config.php sed -i '/\/\/PLACEHOLDER/ r /root/azure.php' /var/www/html/config/config.php
fi fi
if [ -n "$BLACKFIRE_SERVER_ID" ]
then
yes | blackfire agent:config --server-id=$BLACKFIRE_SERVER_ID --server-token=$BLACKFIRE_SERVER_TOKEN
mkdir /var/run/blackfire/
BLACKFIRE_LOG_LEVEL=4 BLACKFIRE_LOG_FILE=/var/log/agent.log blackfire agent &
fi
crontab /etc/oc-cron.conf crontab /etc/oc-cron.conf
/usr/sbin/cron -f & /usr/sbin/cron -f &

2
images/php/Dockerfile
View file

@ -68,7 +68,7 @@ RUN pecl install apcu \
ARG BASE_IMAGE ARG BASE_IMAGE
RUN echo "extension=imagick.so" > $PHP_INI_DIR/conf.d/imagick.ini \ RUN echo "extension=imagick.so" > $PHP_INI_DIR/conf.d/imagick.ini \
&& sh -c 'if [ "$BASE_IMAGE" = "php" ]; then echo "extension=smbclient.so" > $PHP_INI_DIR/conf.d/smbclient.ini; fi' \ && sh -c 'if [ "$BASE_IMAGE" = "php" ]; then echo "extension=smbclient.so" > $PHP_INI_DIR/conf.d/smbclient.ini; fi' \
&& sh -c 'if [ "$BASE_IMAGE" = "php" ]; then echo "extension=blackfire.so\nblackfire.agent_socket=\${BLACKFIRE_PORT}" > $PHP_INI_DIR/conf.d/blackfire.ini; fi' \ && sh -c 'if [ "$BASE_IMAGE" = "php" ]; then echo "extension=blackfire.so" > $PHP_INI_DIR/conf.d/blackfire.ini; fi' \
&& echo "extension=inotify.so" > $PHP_INI_DIR/conf.d/inotify.ini \ && echo "extension=inotify.so" > $PHP_INI_DIR/conf.d/inotify.ini \
&& echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > $PHP_INI_DIR/conf.d/xdebug.ini \ && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > $PHP_INI_DIR/conf.d/xdebug.ini \
&& echo "xdebug.mode=debug,trace,profile" >> $PHP_INI_DIR/conf.d/xdebug.ini \ && echo "xdebug.mode=debug,trace,profile" >> $PHP_INI_DIR/conf.d/xdebug.ini \

4
src/cloud.rs
View file

@ -251,7 +251,7 @@ impl Cloud {
format!("GID={}", gid), format!("GID={}", gid),
format!("SQL={}", options.db.name()), format!("SQL={}", options.db.name()),
]; ];
let mut volumes: Vec<String> = mappings let volumes: Vec<String> = mappings
.into_iter() .into_iter()
.filter_map(|mapping| mapping.get_volume_arg(&id, config)) .filter_map(|mapping| mapping.get_volume_arg(&id, config))
.collect(); .collect();
@ -271,8 +271,6 @@ impl Cloud {
env.push(format!("BLACKFIRE_SERVER_TOKEN={}", blackfire.server_token)); env.push(format!("BLACKFIRE_SERVER_TOKEN={}", blackfire.server_token));
env.push(format!("BLACKFIRE_CLIENT_ID={}", blackfire.client_id)); env.push(format!("BLACKFIRE_CLIENT_ID={}", blackfire.client_id));
env.push(format!("BLACKFIRE_CLIENT_TOKEN={}", blackfire.client_token)); env.push(format!("BLACKFIRE_CLIENT_TOKEN={}", blackfire.client_token));
env.push(format!("BLACKFIRE_SOCKET=/var/run/blackfire/agent.sock"));
volumes.push("/var/run/blackfire/agent.sock:/var/run/blackfire/agent.sock".into());
} }
let service_containers = try_join_all( let service_containers = try_join_all(