Use exec to ensure weblogs get SIGTERM on stop

lib-injection/build/docker/python/dd-lib-python-init-test-django-27/Dockerfile

@@ -9,4 +9,4 @@ EXPOSE 18080
 
 # Many users run a non-root user, ensure this is supported by the injection mechanism
 USER 1000
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]

lib-injection/build/docker/python/dd-lib-python-init-test-django-gunicorn-alpine/Dockerfile

@@ -6,4 +6,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django gunicorn
 EXPOSE 18080
-CMD gunicorn --bind :18080 django_app:application
+CMD ["gunicorn", "--bind", ":18080", "django_app:application"]

lib-injection/build/docker/python/dd-lib-python-init-test-django-gunicorn/Dockerfile

@@ -6,4 +6,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django gunicorn
 EXPOSE 18080
-CMD gunicorn --bind :18080 django_app:application
+CMD ["gunicorn", "--bind", ":18080", "django_app:application"]

lib-injection/build/docker/python/dd-lib-python-init-test-django-preinstalled/Dockerfile

@@ -11,4 +11,4 @@ EXPOSE 18080
 
 # Many users run a non-root user, ensure this is supported by the injection mechanism
 USER 1000
-CMD ddtrace-run python -m django runserver 0.0.0.0:18080
+CMD ["ddtrace-run", "python", "-m", "django", "runserver", "0.0.0.0:18080"]

lib-injection/build/docker/python/dd-lib-python-init-test-django-unsupported-package-force/Dockerfile

@@ -8,4 +8,4 @@ ADD . /src
 RUN pip install django structlog==16.0.0
 
 EXPOSE 18080
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]

lib-injection/build/docker/python/dd-lib-python-init-test-django-uvicorn/Dockerfile

@@ -6,4 +6,4 @@ WORKDIR /src
 ADD . /src
 RUN pip install django uvicorn
 EXPOSE 18080
-CMD uvicorn --host 0.0.0.0 --port 18080 django_app:application
+CMD ["uvicorn", "--host", "0.0.0.0", "--port", "18080", "django_app:application"]

lib-injection/build/docker/python/dd-lib-python-init-test-django/Dockerfile

@@ -9,4 +9,4 @@ EXPOSE 18080
 
 # Many users run a non-root user, ensure this is supported by the injection mechanism
 USER 1000
-CMD python -m django runserver 0.0.0.0:18080
+CMD ["python", "-m", "django", "runserver", "0.0.0.0:18080"]

utils/build/docker/cpp_httpd/httpd.Dockerfile

@@ -24,9 +24,9 @@ RUN a2enmod datadog
 # Create C++ application
 RUN echo "Hello world\n" > /app/index.html
 WORKDIR /app
-RUN echo "#!/bin/bash\napachectl -D FOREGROUND" > app.sh
+RUN echo "#!/bin/bash\nexec apachectl -D FOREGROUND" > app.sh
 RUN chmod +x app.sh
 
 EXPOSE 7777
 
-CMD ./app.sh
+CMD ["./app.sh"]

utils/build/docker/java/spring-boot-openliberty.Dockerfile

@@ -28,6 +28,6 @@ ENV DD_TRACE_HEADER_TAGS='user-agent:http.request.headers.user-agent'
 
 ENV JVM_ARGS='-javaagent:/app/dd-java-agent.jar'
 
-RUN echo "#!/bin/bash\njava -Xmx362m -jar /app/app.jar" > app.sh
+RUN echo "#!/bin/bash\nexec java -Xmx362m -jar /app/app.jar" > app.sh
 RUN chmod +x app.sh
 CMD [ "/app/app.sh" ]

utils/build/docker/java/spring-boot/app.sh

@@ -4,7 +4,7 @@ if [ ${UDS_WEBLOG:-} = "1" ]; then
     ./set-uds-transport.sh
 fi
 
-java \
+exec java \
     -Xmx362m \
     -XX:ErrorFile=/var/log/system-tests/hs_err_%p_%t_%u.log \
     -javaagent:/app/dd-java-agent.jar \

utils/build/docker/java_otel/spring-boot-native.Dockerfile

@@ -17,6 +17,6 @@ RUN mvn clean package
 # Set up required args
 RUN echo $OTEL_VERSION > SYSTEM_TESTS_LIBRARY_VERSION
 
-RUN echo "#!/bin/bash\njava -jar target/myproject-3.0.0-SNAPSHOT.jar --server.port=7777" > app.sh
+RUN echo "#!/bin/bash\nexec java -jar target/myproject-3.0.0-SNAPSHOT.jar --server.port=7777" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/java_otel/spring-boot/app.sh

@@ -4,4 +4,4 @@ if [ ${UDS_WEBLOG:-} = "1" ]; then
     ./set-uds-transport.sh
 fi
 
-java -Xmx362m -javaagent:/app/dd-java-agent.jar -jar /app/myproject-0.0.1-SNAPSHOT.jar --server.port=7777
+exec java -Xmx362m -javaagent:/app/dd-java-agent.jar -jar /app/myproject-0.0.1-SNAPSHOT.jar --server.port=7777

utils/build/docker/nodejs/anthropic-js.Dockerfile

@@ -24,5 +24,5 @@ RUN /binaries/install_ddtrace.sh
 
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
-RUN printf 'node app.js' >> app.sh
-CMD ./app.sh
+RUN printf 'exec node app.js' >> app.sh
+CMD ["./app.sh"]

utils/build/docker/nodejs/express4-typescript.Dockerfile

@@ -24,8 +24,8 @@ ENV DD_DATA_STREAMS_ENABLED=true
 
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
-RUN printf 'node dist/app.js' >> app.sh
-CMD ./app.sh
+RUN printf 'exec node dist/app.js' >> app.sh
+CMD ["./app.sh"]
 
 COPY utils/build/docker/nodejs/install_ddtrace.sh binaries* /binaries/
 

utils/build/docker/nodejs/express4.Dockerfile

@@ -31,8 +31,8 @@ ENV DD_DATA_STREAMS_ENABLED=true
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
 RUN chmod +x app.sh
-RUN printf 'node app.js' >> app.sh
-CMD ./app.sh
+RUN printf 'exec node app.js' >> app.sh
+CMD ["./app.sh"]
 
 COPY utils/build/docker/nodejs/install_ddtrace.sh binaries* /binaries/
 RUN /binaries/install_ddtrace.sh

utils/build/docker/nodejs/express5.Dockerfile

@@ -29,8 +29,8 @@ ENV DD_DATA_STREAMS_ENABLED=true
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
 RUN chmod +x app.sh
-RUN printf 'node app.js' >> app.sh
-CMD ./app.sh
+RUN printf 'exec node app.js' >> app.sh
+CMD ["./app.sh"]
 
 COPY utils/build/docker/nodejs/install_ddtrace.sh binaries* /binaries/
 RUN /binaries/install_ddtrace.sh

utils/build/docker/nodejs/fastify.Dockerfile

@@ -28,8 +28,8 @@ ENV DD_DATA_STREAMS_ENABLED=true
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
 RUN chmod +x app.sh
-RUN printf 'node app.js' >> app.sh
-CMD ./app.sh
+RUN printf 'exec node app.js' >> app.sh
+CMD ["./app.sh"]
 
 COPY utils/build/docker/nodejs/install_ddtrace.sh binaries* /binaries/
 RUN /binaries/install_ddtrace.sh

utils/build/docker/nodejs/google_genai-js.Dockerfile

@@ -24,5 +24,5 @@ RUN /binaries/install_ddtrace.sh
 
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
-RUN printf 'node app.js' >> app.sh
-CMD ./app.sh
+RUN printf 'exec node app.js' >> app.sh
+CMD ["./app.sh"]

utils/build/docker/nodejs/nextjs.Dockerfile

@@ -25,6 +25,6 @@ ENV DD_DATA_STREAMS_ENABLED=true
 ENV PORT=7777
 ENV HOSTNAME=0.0.0.0
 COPY utils/build/docker/nodejs/app.sh app.sh
-RUN printf './node_modules/.bin/next start' >> app.sh
 ENV NODE_OPTIONS="--import dd-trace/initialize.mjs"
-CMD ./app.sh
+RUN printf 'exec ./node_modules/.bin/next start' >> app.sh
+CMD ["./app.sh"]

utils/build/docker/nodejs/openai-js.Dockerfile

@@ -24,5 +24,5 @@ RUN /binaries/install_ddtrace.sh
 
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
-RUN printf 'node app.js' >> app.sh
-CMD ./app.sh
+RUN printf 'exec node app.js' >> app.sh
+CMD ["./app.sh"]

utils/build/docker/nodejs/parametric/app.sh

@@ -13,4 +13,4 @@ if [ -e /volumes/dd-trace-js ]; then
 fi
 
 # shellcheck disable=SC2086
-node server.js ${SYSTEM_TESTS_EXTRA_COMMAND_ARGUMENTS:-}
+exec node server.js ${SYSTEM_TESTS_EXTRA_COMMAND_ARGUMENTS:-}

utils/build/docker/nodejs/uds-express4.Dockerfile

@@ -33,9 +33,9 @@ ENV DD_DATA_STREAMS_ENABLED=true
 
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
-RUN printf 'node app.js' >> app.sh
 COPY utils/build/docker/set-uds-transport.sh set-uds-transport.sh
-CMD ./app.sh
+RUN printf 'exec node app.js' >> app.sh
+CMD ["./app.sh"]
 
 COPY utils/build/docker/nodejs/install_ddtrace.sh binaries* /binaries/
 RUN /binaries/install_ddtrace.sh

utils/build/docker/nodejs_otel/express4-otel.Dockerfile

@@ -40,5 +40,5 @@ RUN npm install --save opentelemetry-instrumentation-mssql || npm install --save
 
 # docker startup
 COPY utils/build/docker/nodejs/app.sh app.sh
-RUN printf 'node --require @opentelemetry/auto-instrumentations-node/register app.js' >> app.sh
-CMD ./app.sh
+RUN printf 'exec node --require @opentelemetry/auto-instrumentations-node/register app.js' >> app.sh
+CMD ["./app.sh"]

utils/build/docker/php/apache-mod-7.0-zts.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/apache-mod-7.0.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/apache-mod-7.1-zts.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/apache-mod-7.1.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/apache-mod-7.2-zts.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/apache-mod-7.2.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/apache-mod-7.3-zts.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/apache-mod-7.3.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/apache-mod-7.4-zts.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/apache-mod-7.4.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/apache-mod-8.0-zts.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/apache-mod-8.0.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/apache-mod-8.1-zts.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/apache-mod-8.1.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/apache-mod-8.2-zts.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/apache-mod-8.2.Dockerfile

@@ -20,6 +20,6 @@ RUN rm -rf /tmp/php/
 ADD utils/build/docker/php/apache-mod/entrypoint.sh /
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/app.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-#Nothing to do here. This file is to allow --sleep execution
+exec dumb-init /entrypoint.sh

utils/build/docker/php/php-fpm-7.0.Dockerfile

@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/php-fpm-7.1.Dockerfile

@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/php-fpm-7.2.Dockerfile

@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/php-fpm-7.3.Dockerfile

@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/php-fpm-7.4.Dockerfile

@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/php-fpm-8.0.Dockerfile

@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/php-fpm-8.1.Dockerfile

@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/php-fpm-8.2.Dockerfile

@@ -18,6 +18,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]

utils/build/docker/php/php-fpm-8.5.Dockerfile

@@ -19,6 +19,6 @@ EXPOSE 7777/tcp
 
 WORKDIR /binaries
 ENTRYPOINT []
-RUN echo "#!/bin/bash\ndumb-init /entrypoint.sh" > app.sh
+RUN echo "#!/bin/bash\nexec dumb-init /entrypoint.sh" > app.sh
 RUN chmod +x app.sh
 CMD [ "./app.sh" ]