Re-add entrypoint for local usage of images (#403)

* Re-add entrypoint for local usage of images

* Remove -l in entrypoint

deb-arm/Dockerfile

@@ -122,3 +122,9 @@ RUN if [ "$DD_TARGET_ARCH" = "aarch64" ] ; then set -ex \
 
 # Force umask to 0022
 RUN echo "umask 0022" >> /root/.bashrc
+
+# Entrypoint - only for local usage, Kubernetes-based Gitlab runners overwrite this
+COPY ./entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

deb-x64/Dockerfile

@@ -196,3 +196,9 @@ RUN mkdir -p /go/src/github.com/DataDog/datadog-agent
 
 # Force umask to 0022
 RUN echo "umask 0022" >> /root/.bashrc
+
+# Entrypoint - only for local usage, Kubernetes-based Gitlab runners overwrite this
+COPY ./entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

entrypoint.sh

@@ -1,22 +1,6 @@
-#!/bin/bash -l
+#!/bin/bash
 set -e
 
 source /root/.bashrc
 
-if command -v conda; then
-  # Only try to use conda if it's installed.
-  # On ARM32 images, we use the system Python 3 because conda is not supported.
-  conda activate ddpy3
-fi
-
-if [ "$DD_TARGET_ARCH" = "aarch64" ] ; then
-    export GIMME_ARCH=arm64
-elif [ "$DD_TARGET_ARCH" = "armhf" ] ; then
-    export GIMME_ARCH=arm
-fi
-
-if [ -n "$GIMME_GO_VERSION" ] ; then
-    eval "$(gimme)"
-fi
-
 exec "$@"

rpm-arm64/Dockerfile

@@ -115,3 +115,9 @@ RUN chmod +x /build-gcc.sh \
 
 # Force umask to 0022
 RUN echo "umask 0022" >> /root/.bashrc
+
+# Entrypoint - only for local usage, Kubernetes-based Gitlab runners overwrite this
+COPY ./entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

rpm-armhf/Dockerfile

@@ -99,3 +99,9 @@ ENV PATH="${GOPATH}/bin:${PATH}"
 
 # Force umask to 0022
 RUN echo "umask 0022" >> /root/.bashrc
+
+# Entrypoint - only for local usage, Kubernetes-based Gitlab runners overwrite this
+COPY ./entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

rpm-x64/Dockerfile

@@ -276,3 +276,9 @@ RUN chmod +x /build-gcc.sh \
 
 # Force umask to 0022
 RUN echo "umask 0022" >> /root/.bashrc
+
+# Entrypoint - only for local usage, Kubernetes-based Gitlab runners overwrite this
+COPY ./entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

suse-x64/Dockerfile

@@ -175,3 +175,9 @@ RUN mkdir -p /usr/local/var/lib/rpm \
 
 # Force umask to 0022
 RUN echo "umask 0022" >> /root/.bashrc
+
+# Entrypoint - only for local usage, Kubernetes-based Gitlab runners overwrite this
+COPY ./entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]