diff --git a/php/.env b/php/.env index 98b53b71..98a68075 100644 --- a/php/.env +++ b/php/.env @@ -1 +1 @@ -DD_TRACE_VERSION=0.30.0 +DD_TRACE_VERSION=0.34.0 diff --git a/php/Dockerfiles/nginx/Dockerfile b/php/Dockerfiles/nginx/Dockerfile new file mode 100644 index 00000000..259af396 --- /dev/null +++ b/php/Dockerfiles/nginx/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx:1.17.5-alpine + +COPY ./default.conf /etc/nginx/conf.d/default.conf diff --git a/php/Dockerfiles/nginx/default.conf b/php/Dockerfiles/nginx/default.conf new file mode 100644 index 00000000..5377ed88 --- /dev/null +++ b/php/Dockerfiles/nginx/default.conf @@ -0,0 +1,33 @@ +server { + listen 80; + + access_log /dev/stdout; + error_log /dev/stdout; + + server_name localhost; + + root /var/www/public; + index index.html index.php; + + rewrite ^/(73)/(.*\.(gif|jpg|png|ico|css|js))$ /$2 last; + + location / { + add_header X-uri $uri always; + add_header X-document_root $document_root always; + add_header X-fastcgi_script_name $fastcgi_script_name always; + add_header X-fastcgi_path_info $fastcgi_path_info always; + add_header X-PHP-VERSION $1 always; + add_header X-PHP-PATH $2 always; + + location ~* ^/(73)(.+)$ { + try_files $2 $2/index.php =404; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass php-fpm-73:9000; + fastcgi_index index.php; + include fastcgi_params; + include fastcgi_params_shared; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + } + } +} diff --git a/php/Dockerfiles/nginx/fastcgi_params_shared b/php/Dockerfiles/nginx/fastcgi_params_shared new file mode 100644 index 00000000..083b041a --- /dev/null +++ b/php/Dockerfiles/nginx/fastcgi_params_shared @@ -0,0 +1,3 @@ +fastcgi_param DD_SHARED_VALUE "Some shared value"; +fastcgi_param DD_AGENT_HOST agent; +fastcgi_param DD_TRACE_URL_AS_RESOURCE_NAMES_ENABLED true; diff --git a/php/Dockerfiles/php-fpm/Dockerfile73 b/php/Dockerfiles/php-fpm/Dockerfile73 new file mode 100644 index 00000000..adb15619 --- /dev/null +++ b/php/Dockerfiles/php-fpm/Dockerfile73 @@ -0,0 +1,20 @@ +FROM php:7.3-fpm + +RUN apt-get update \ + && apt-get install -y libmcrypt-dev \ + && pecl install mcrypt-1.0.3 \ + && docker-php-ext-enable mcrypt \ + && docker-php-ext-install mysqli \ + && rm -rf /var/lib/apt/lists/* + +# Install composer +RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ + && php composer-setup.php --install-dir="/usr/bin" --filename=composer \ + && php -r "unlink('composer-setup.php');" \ + && composer self-update + +ARG DD_TRACE_VERSION + +# Install DDTrace deb +ADD https://github.com/DataDog/dd-trace-php/releases/download/${DD_TRACE_VERSION}/datadog-php-tracer_${DD_TRACE_VERSION}_amd64.deb datadog-php-tracer.deb +RUN dpkg -i datadog-php-tracer.deb diff --git a/php/apps/basic/index.php b/php/apps/basic/index.php new file mode 100644 index 00000000..42dff52e --- /dev/null +++ b/php/apps/basic/index.php @@ -0,0 +1,3 @@ +