From 709fbd9cf00174fa46aed9462e757c00508bcd18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 4 Dec 2023 16:56:08 +0100 Subject: [PATCH] fix: blackfire enabling script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- docker/Dockerfile.php.template | 5 ++--- docker/Dockerfile.php71 | 5 ++--- docker/Dockerfile.php72 | 5 ++--- docker/Dockerfile.php73 | 5 ++--- docker/Dockerfile.php74 | 5 ++--- docker/Dockerfile.php80 | 5 ++--- docker/Dockerfile.php81 | 5 ++--- docker/bin/bootstrap.sh | 2 ++ docker/php82/Dockerfile | 5 ++--- docker/php83/Dockerfile | 5 ++--- 10 files changed, 20 insertions(+), 27 deletions(-) diff --git a/docker/Dockerfile.php.template b/docker/Dockerfile.php.template index 17914e0..d6f78f7 100644 --- a/docker/Dockerfile.php.template +++ b/docker/Dockerfile.php.template @@ -66,9 +66,8 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ && apt-get update \ && (apt-get install -y --no-install-recommends blackfire \ - && rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \ - && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \ - mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \ + && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ + && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini) \ || echo "Skipped blackfire as the installation failed" \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/Dockerfile.php71 b/docker/Dockerfile.php71 index af6fc36..cb6be13 100644 --- a/docker/Dockerfile.php71 +++ b/docker/Dockerfile.php71 @@ -66,9 +66,8 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ && apt-get update \ && (apt-get install -y --no-install-recommends blackfire \ - && rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \ - && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \ - mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \ + && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ + && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini) \ || echo "Skipped blackfire as the installation failed" \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/Dockerfile.php72 b/docker/Dockerfile.php72 index 0a9054a..768f562 100644 --- a/docker/Dockerfile.php72 +++ b/docker/Dockerfile.php72 @@ -66,9 +66,8 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ && apt-get update \ && (apt-get install -y --no-install-recommends blackfire \ - && rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \ - && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \ - mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \ + && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ + && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini) \ || echo "Skipped blackfire as the installation failed" \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/Dockerfile.php73 b/docker/Dockerfile.php73 index cefd932..fe6a279 100644 --- a/docker/Dockerfile.php73 +++ b/docker/Dockerfile.php73 @@ -66,9 +66,8 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ && apt-get update \ && (apt-get install -y --no-install-recommends blackfire \ - && rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \ - && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \ - mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \ + && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ + && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini) \ || echo "Skipped blackfire as the installation failed" \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/Dockerfile.php74 b/docker/Dockerfile.php74 index 22a41e6..4a6d41d 100644 --- a/docker/Dockerfile.php74 +++ b/docker/Dockerfile.php74 @@ -66,9 +66,8 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ && apt-get update \ && (apt-get install -y --no-install-recommends blackfire \ - && rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \ - && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \ - mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \ + && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ + && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini) \ || echo "Skipped blackfire as the installation failed" \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/Dockerfile.php80 b/docker/Dockerfile.php80 index fa99883..b06a093 100644 --- a/docker/Dockerfile.php80 +++ b/docker/Dockerfile.php80 @@ -66,9 +66,8 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ && apt-get update \ && (apt-get install -y --no-install-recommends blackfire \ - && rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \ - && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \ - mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \ + && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ + && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini) \ || echo "Skipped blackfire as the installation failed" \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/Dockerfile.php81 b/docker/Dockerfile.php81 index 3787176..070c100 100644 --- a/docker/Dockerfile.php81 +++ b/docker/Dockerfile.php81 @@ -66,9 +66,8 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ && apt-get update \ && (apt-get install -y --no-install-recommends blackfire \ - && rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \ - && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \ - mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \ + && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ + && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini) \ || echo "Skipped blackfire as the installation failed" \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/bin/bootstrap.sh b/docker/bin/bootstrap.sh index 804566e..2a6a2be 100755 --- a/docker/bin/bootstrap.sh +++ b/docker/bin/bootstrap.sh @@ -293,6 +293,8 @@ install() { output "🔧 Preparing cron job" + OCC dav:sync-system-addressbook + # Setup initial configuration OCC background:cron diff --git a/docker/php82/Dockerfile b/docker/php82/Dockerfile index 07c4bd6..79e7ae8 100644 --- a/docker/php82/Dockerfile +++ b/docker/php82/Dockerfile @@ -66,9 +66,8 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ && apt-get update \ && (apt-get install -y --no-install-recommends blackfire \ - && rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \ - && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \ - mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \ + && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ + && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini) \ || echo "Skipped blackfire as the installation failed" \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/php83/Dockerfile b/docker/php83/Dockerfile index 1e8c3ec..7c20980 100644 --- a/docker/php83/Dockerfile +++ b/docker/php83/Dockerfile @@ -67,9 +67,8 @@ RUN wget -q -O - https://packages.blackfire.io/gpg.key | sudo apt-key add - \ && echo "deb http://packages.blackfire.io/debian any main" | sudo tee /etc/apt/sources.list.d/blackfire.list \ && apt-get update \ && (apt-get install -y --no-install-recommends blackfire \ - && rm -f /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini \ - && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini && \ - mv $PHP_INI_DIR/conf.d/zz-blackfire.ini $PHP_INI_DIR/conf.d/zz-blackfire.ini.disabled) \ + && mv /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini /usr/local/etc/php/conf.d/docker-php-ext-blackfire.ini.disabled \ + && printf "\n\nblackfire.agent_socket=tcp://blackfire:8307\n" >> $PHP_INI_DIR/conf.d/zz-blackfire.ini) \ || echo "Skipped blackfire as the installation failed" \ && rm -rf /var/lib/apt/lists/*