Fix based on PR feedback

Author: aerostitch

Dockerfile-dogstatsd

@@ -16,7 +16,7 @@ RUN echo "deb http://apt.datadoghq.com/ stable main" > /etc/apt/sources.list.d/d
  && apt-get update \
  && apt-get install --no-install-recommends -y datadog-agent="${AGENT_VERSION}" ca-certificates \
  && apt-get clean \
- && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
+ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Add install and config files
 COPY entrypoint-dogstatsd.sh /entrypoint.sh

Dockerfile-dogstatsd-alpine

@@ -9,7 +9,6 @@ ENV DD_HOME=/opt/datadog-agent \
     AGENT_VERSION=5.16.0 \
     DD_ETC_ROOT="/opt/datadog-agent/agent" \        
     PATH="/opt/datadog-agent/venv/bin:/opt/datadog-agent/agent/bin:$PATH" \
-    PATH="${DD_HOME}/venv/bin:${DD_HOME}/bin:${PATH}" \
     PYTHONPATH=/opt/datadog-agent/agent \
     DD_CONF_LOG_TO_SYSLOG=no \
     NON_LOCAL_TRAFFIC=yes

entrypoint-dogstatsd.sh

@@ -11,13 +11,8 @@ fi
 ##### Core config #####
 python /config_builder.py
 
-# ensure that the trace-agent doesn't run unless instructed to                                           
-if [ $DD_APM_ENABLED ]; then                      
-  export DD_APM_ENABLED=${DD_APM_ENABLED}         
-else                                               
-  # disable the agent when the env var is absent  
-  export DD_APM_ENABLED=false                     
-fi
+# ensure that the trace-agent doesn't run unless instructed to
+export DD_APM_ENABLED=${DD_APM_ENABLED:-false}
 
 ##### Starting up #####