Allow for setting non-default build tags. (#135)

Author: purple4reina

scripts/build_binary_and_layer_dockerized.sh

@@ -21,10 +21,16 @@ fi
 
 if [ -z "$CLOUD_RUN" ]; then
     CMD_PATH="cmd/serverless"
-    BUILD_TAGS="serverless otlp"
 else
     CMD_PATH="cmd/serverless-init"
-    BUILD_TAGS="serverless"
+fi
+
+if [ -z "$BUILD_TAGS" ]; then
+    if [ -z "$CLOUD_RUN" ]; then
+        BUILD_TAGS="serverless otlp"
+    else
+        BUILD_TAGS="serverless"
+    fi
 fi
 
 AGENT_PATH="../datadog-agent"
@@ -59,10 +65,6 @@ if [ "$RACE_DETECTION_ENABLED" = "true" ]; then
     BUILD_FILE=Dockerfile.race.build
 fi
 
-if [ -z "$BUILD_TAGS" ]; then
-    BUILD_TAGS="serverless"
-fi
-
 function docker_build_zip {
     arch=$1
     suffix=$2