diff --git a/Dockerfile b/Dockerfile index 8332d71..8969993 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,17 +5,18 @@ USER root ENV DEBIAN_FRONTEND=noninteractive RUN set -x \ - && apt-get update \ - && apt-get -y install build-essential curl php-cli python3 python3-pip xz-utils \ - && apt-get -y clean \ - && rm -rf /var/lib/apt/lists/* - + && apt-get update \ + && apt-get -y install --no-install-recommends build-essential curl php-cli python3 python3-pip xz-utils \ + && apt-get -y clean \ + && rm -rf /var/lib/apt/lists/* RUN set -x \ - && update-alternatives --install /usr/bin/python python /usr/bin/python3 1 + && update-alternatives --install /usr/bin/python python /usr/bin/python3 1 RUN set -x \ && curl -OL "https://go.dev/dl/go1.25.1.linux-amd64.tar.gz" \ && echo "7716a0d940a0f6ae8e1f3b3f4f36299dc53e31b16840dbd171254312c41ca12e go1.25.1.linux-amd64.tar.gz" | sha256sum -c - \ && tar -C /usr/local -xzf go1.25.1.linux-amd64.tar.gz \ && chmod +x /usr/local/go/bin/go \ - && ln -s /usr/local/go/bin/go /usr/local/bin/go + && ln -s /usr/local/go/bin/go /usr/local/bin/go \ + && rm go1.25.1.linux-amd64.tar.gz + diff --git a/base_images/Dockerfile.python-3.11-ddprof b/base_images/Dockerfile.python-3.11-ddprof index 08fe92a..490bcce 100644 --- a/base_images/Dockerfile.python-3.11-ddprof +++ b/base_images/Dockerfile.python-3.11-ddprof @@ -1,17 +1,20 @@ FROM python:3.11 AS base -ENV DD_PROFILING_ENABLED true -ENV DD_TRACE_ENABLED false -ENV DD_TRACE_DEBUG true -ENV DD_PROFILING_EXPORT_LIBDD_ENABLED 1 -ENV DD_PROFILING_EXPORT_PY_ENABLED 0 +ENV DEBIAN_FRONTEND=noninteractive + +ENV DD_PROFILING_ENABLED=true +ENV DD_TRACE_ENABLED=false +ENV DD_TRACE_DEBUG=true +ENV DD_PROFILING_EXPORT_LIBDD_ENABLED=1 +ENV DD_PROFILING_EXPORT_PY_ENABLED=0 ENV DD_PROFILING_OUTPUT_PPROF="/app/data/profiles" # Native profiler deps -RUN apt-get update && apt-get install -y \ +RUN apt-get update && apt-get install --no-install-recommends -y \ curl \ jq \ wget \ + && apt-get clean \ && rm -rf /var/lib/apt/lists/* # Allow user to force a more recent install diff --git a/profilers/ddprof/install_profiler.sh b/profilers/ddprof/install_profiler.sh index 2bd10a6..e1c8061 100755 --- a/profilers/ddprof/install_profiler.sh +++ b/profilers/ddprof/install_profiler.sh @@ -82,7 +82,7 @@ pushd /tmp if look_in_folder ${binaries_path}; then echo "Success finding file in binaries" elif look_in_s3 ${s3_path}; then - echo "Success fetchin from s3..." + echo "Success fetching from s3..." else echo "Fetching latest GH release..." # This should not fail