From 4ab45b4d6b39ae9c5ef29bee1ed9321de297de25 Mon Sep 17 00:00:00 2001 From: Laplie Anderson Date: Wed, 25 Sep 2024 14:26:00 -0400 Subject: [PATCH] Add php kubernetes lib injection tests --- .github/workflows/run-lib-injection.yml | 6 +++--- lib-injection/build/build_lib_injection_images.sh | 2 ++ .../docker/php/dd-lib-php-init-test-83/Dockerfile | 8 ++++++++ .../docker/php/dd-lib-php-init-test-83/build.sh | 7 +++++++ .../docker/php/dd-lib-php-init-test-83/index.php | 3 +++ .../php/dd-lib-php-init-test-alpine/Dockerfile | 12 ++++++++++++ .../docker/php/dd-lib-php-init-test-alpine/build.sh | 7 +++++++ .../docker/php/dd-lib-php-init-test-alpine/index.php | 3 +++ 8 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 lib-injection/build/docker/php/dd-lib-php-init-test-83/Dockerfile create mode 100755 lib-injection/build/docker/php/dd-lib-php-init-test-83/build.sh create mode 100644 lib-injection/build/docker/php/dd-lib-php-init-test-83/index.php create mode 100644 lib-injection/build/docker/php/dd-lib-php-init-test-alpine/Dockerfile create mode 100755 lib-injection/build/docker/php/dd-lib-php-init-test-alpine/build.sh create mode 100644 lib-injection/build/docker/php/dd-lib-php-init-test-alpine/index.php diff --git a/.github/workflows/run-lib-injection.yml b/.github/workflows/run-lib-injection.yml index 3ea34327e0..32a3dcafde 100644 --- a/.github/workflows/run-lib-injection.yml +++ b/.github/workflows/run-lib-injection.yml @@ -42,7 +42,7 @@ jobs: "golang": [], "java": [{"name":"dd-lib-java-init-test-app","supported":"true"},{"name":"jdk7-app","supported":"false"}], "nodejs": [{"name":"sample-app","supported":"true"},{"name":"sample-app-node13","supported":"false"}], - "php": [], + "php": [{"name":"dd-lib-php-init-test-83","supported":"true"},{"name":"dd-lib-php-init-test-alpine","supported":"true"}], "python": [{"name":"dd-lib-python-init-test-django","supported":"true"}, {"name":"dd-lib-python-init-test-django-gunicorn", "supported":"true"}, {"name":"dd-lib-python-init-test-django-uvicorn","supported":"true"}], "ruby": [{"name":"dd-lib-ruby-init-test-rails","supported":"true"}, {"name":"dd-lib-ruby-init-test-rails-explicit","supported":"true"}, {"name":"dd-lib-ruby-init-test-rails-gemsrb","supported":"true"}] } @@ -53,7 +53,7 @@ jobs: "golang": [], "java": ["gcr.io/datadoghq/dd-lib-java-init:latest"], "nodejs": ["gcr.io/datadoghq/dd-lib-js-init:latest"], - "php": [], + "php": ["gcr.io/datadoghq/dd-lib-php-init:latest"], "python": ["gcr.io/datadoghq/dd-lib-python-init:latest"], "ruby": ["gcr.io/datadoghq/dd-lib-ruby-init:latest"], } @@ -64,7 +64,7 @@ jobs: "golang": [], "java": ["ghcr.io/datadog/dd-trace-java/dd-lib-java-init:latest_snapshot"], "nodejs": ["ghcr.io/datadog/dd-trace-js/dd-lib-js-init:latest_snapshot"], - "php": [], + "php": ["ghcr.io/datadog/dd-trace-php/dd-lib-php-init:latest_snapshot"], "python": ["ghcr.io/datadog/dd-trace-py/dd-lib-python-init:latest_snapshot"], "ruby": ["ghcr.io/datadog/dd-trace-rb/dd-lib-ruby-init:latest_snapshot"], } diff --git a/lib-injection/build/build_lib_injection_images.sh b/lib-injection/build/build_lib_injection_images.sh index b27799722c..c0f3cf20ce 100755 --- a/lib-injection/build/build_lib_injection_images.sh +++ b/lib-injection/build/build_lib_injection_images.sh @@ -15,6 +15,8 @@ variants=(["dd-lib-dotnet-init-test-app"]="dotnet" ["dd-lib-ruby-init-test-rails-explicit"]="ruby" ["dd-lib-ruby-init-test-rails-gemsrb"]="ruby" ["dd-lib-java-init-test-app"]="java" + ["dd-lib-php-init-test-83"]="php" + ["dd-lib-php-init-test-alpine"]="php" ) docker buildx create --name multiarch --driver docker-container --use diff --git a/lib-injection/build/docker/php/dd-lib-php-init-test-83/Dockerfile b/lib-injection/build/docker/php/dd-lib-php-init-test-83/Dockerfile new file mode 100644 index 0000000000..d305935dfd --- /dev/null +++ b/lib-injection/build/docker/php/dd-lib-php-init-test-83/Dockerfile @@ -0,0 +1,8 @@ +FROM public.ecr.aws/docker/library/php:8.3 + +RUN mkdir /app +WORKDIR /app + +COPY index.php /app + +CMD ["php", "-S", "0.0.0.0:18080"] diff --git a/lib-injection/build/docker/php/dd-lib-php-init-test-83/build.sh b/lib-injection/build/docker/php/dd-lib-php-init-test-83/build.sh new file mode 100755 index 0000000000..9c2b6dc9f2 --- /dev/null +++ b/lib-injection/build/docker/php/dd-lib-php-init-test-83/build.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +if [ -z "${BUILDX_PLATFORMS}" ] ; then + BUILDX_PLATFORMS=`docker buildx imagetools inspect --raw python:3.12 | jq -r 'reduce (.manifests[] | [ .platform.os, .platform.architecture, .platform.variant ] | join("/") | sub("\\/$"; "")) as $item (""; . + "," + $item)' | sed 's/,//'` +fi +echo "Build for platforms: ${BUILDX_PLATFORMS}" +docker buildx build --platform ${BUILDX_PLATFORMS} --tag ${LIBRARY_INJECTION_TEST_APP_IMAGE} --push . \ No newline at end of file diff --git a/lib-injection/build/docker/php/dd-lib-php-init-test-83/index.php b/lib-injection/build/docker/php/dd-lib-php-init-test-83/index.php new file mode 100644 index 0000000000..655bf8b3e9 --- /dev/null +++ b/lib-injection/build/docker/php/dd-lib-php-init-test-83/index.php @@ -0,0 +1,3 @@ +