From abeb11cd217f6d77ea9240a9ae8fff3f24c1c255 Mon Sep 17 00:00:00 2001 From: Anne van de Venis Date: Wed, 31 May 2023 12:18:58 +0200 Subject: [PATCH 1/2] Include ddappsec.so in datadog extension --- layers/datadog/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/layers/datadog/Dockerfile b/layers/datadog/Dockerfile index eac9e2b7..bca6f969 100644 --- a/layers/datadog/Dockerfile +++ b/layers/datadog/Dockerfile @@ -15,6 +15,7 @@ RUN php datadog-setup.php --php-bin=all --enable-profiling RUN cp "$(php-config --extension-dir)/ddtrace.so" /tmp/ddtrace.so && \ cp "$(php-config --extension-dir)/datadog-profiling.so" /tmp/datadog-profiling.so && \ + cp "$(php-config --extension-dir)/ddappsec.so" /tmp/ddappsec.so && \ cp "$(php-config --ini-dir)/98-ddtrace.ini" /tmp/ext.ini RUN sed -i 's/extension = ddtrace\.so/extension = \/opt\/bref-extra\/ddtrace.so/' /tmp/ext.ini && \ @@ -29,5 +30,6 @@ FROM scratch # Copy things we installed to the final image COPY --from=ext /tmp/ddtrace.so /opt/bref-extra/ddtrace.so COPY --from=ext /tmp/datadog-profiling.so /opt/bref-extra/datadog-profiling.so +COPY --from=ext /tmp/ddappsec.so /opt/bref-extra/ddappsec.so COPY --from=ext /tmp/ext.ini /opt/bref/etc/php/conf.d/98-ddtrace.ini COPY --from=ext /opt/datadog/ /opt/datadog From 2d9f3657001152258d5a386194266d44a88866eb Mon Sep 17 00:00:00 2001 From: Anne van de Venis Date: Wed, 31 May 2023 12:28:01 +0200 Subject: [PATCH 2/2] Update path to ddappsec.so --- layers/datadog/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/layers/datadog/Dockerfile b/layers/datadog/Dockerfile index bca6f969..c0e30a74 100644 --- a/layers/datadog/Dockerfile +++ b/layers/datadog/Dockerfile @@ -20,6 +20,7 @@ RUN cp "$(php-config --extension-dir)/ddtrace.so" /tmp/ddtrace.so && \ RUN sed -i 's/extension = ddtrace\.so/extension = \/opt\/bref-extra\/ddtrace.so/' /tmp/ext.ini && \ sed -i 's/extension = datadog-profiling\.so/extension = \/opt\/bref-extra\/datadog-profiling.so/' /tmp/ext.ini && \ + sed -i 's/extension = ddappsec\.so/\/opt\/bref-extra\/ddappsec.so/' /tmp/ext.ini && \ sed -i 's/;datadog\.agent_host.*$/datadog\.agent_host = 127.0.0.1/' /tmp/ext.ini && \ sed -i 's/^.*datadog\.appsec\.enabled.*$/datadog.appsec.enabled = Off/' /tmp/ext.ini && \ sed -i 's/datadog\.profiling\.enabled = On/datadog.profiling.enabled = 1/' /tmp/ext.ini