only use upx compression on x86 platform (#559)

* only use upx compression on x86 platform

* pin upx version

* restore previous layer size check

* alpine has no apt-get

* bump alpine upx version to 4.2.4 since it's the one in the repo

* fix script

* check if upx is already installed

* Revert "check if upx is already installed"

This reverts commit ff62c8b.

* try another version of upx

* fix datadog path

* fix datadog name

* fix filename

* the go binary is already stirpped, running it again causes  error: the input file '/datadog-agent-go' has no sections

* relax size limit

Author: alexgallotta

.gitlab/scripts/Dockerfile.build_layer

@@ -3,11 +3,10 @@ ARG DATADOG_WRAPPER=datadog_wrapper
 ARG SUFFIX
 
 RUN apt-get update
-RUN apt-get install -y zip binutils upx
+RUN apt-get install -y zip binutils
 
 COPY .binaries/datadog-agent-$SUFFIX /datadog-agent-go
-RUN strip /datadog-agent-go
-RUN upx -1 /datadog-agent-go
+RUN if [ "$PLATFORM" = "x86_64" ]; then apt-get install -y upx=3.96-r0 && upx -1 /datadog-agent-go; fi
 
 RUN mkdir /extensions
 WORKDIR /extensions

.gitlab/scripts/Dockerfile.go_agent.alpine.compile

@@ -42,6 +42,11 @@ RUN /usr/lib/go/bin/go tool nm datadog-agent | grep -w 'github.com/DataDog/datad
     (echo "agentVersionDefault variable doesn't exist" && exit 1)
 
 RUN strip datadog-agent
+RUN arch="$(uname -m)"; \
+    if [ "${arch}" = 'x86_64' ]; then \
+      apk add --no-cache upx=3.96-r1 && upx -1 datadog-agent; \
+    fi;
+
 
 # keep the smallest possible docker image
 FROM scratch

.gitlab/scripts/Dockerfile.go_agent.compile

@@ -44,6 +44,7 @@ RUN /usr/local/go/bin/go tool nm datadog-agent | grep -w 'github.com/DataDog/dat
     (echo "agentVersionDefault variable doesn't exist" && exit 1)
 
 RUN strip datadog-agent
+RUN if [ "$arch" = "x86_64" ]; then apt-get install -y upx=3.96-r0 && upx -1 /datadog-agent; fi
 
 # keep the smallest possible docker imag
 FROM scratch

.gitlab/scripts/check_layer_size.sh

@@ -24,7 +24,7 @@ if [ -z "$LAYER_FILE" ]; then
 fi
 
 MAX_LAYER_COMPRESSED_SIZE_KB=$(( 23 * 1024)) # 23 MB, amd64 is 22, while arm64 is 20
-MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(( 30 * 1024)) # 53 MB -> 30MB with UPX
+MAX_LAYER_UNCOMPRESSED_SIZE_KB=$(( 54 * 1024 )) # 53 MB, amd is 53, while arm64 is 47
 
 FILE=".layers"/$LAYER_FILE
 FILE_SIZE=$(stat --printf="%s" "$FILE")

scripts/Dockerfile.bottlecap.alpine.build

@@ -32,11 +32,11 @@ ARG DATADOG_WRAPPER=datadog_wrapper
 ARG GO_AGENT_PATH
 
 RUN apt-get update
-RUN apt-get install -y zip binutils upx
+RUN apt-get install -y zip binutils
 
 COPY .layers/$GO_AGENT_PATH/extensions/datadog-agent /datadog-agent-go
 RUN strip /datadog-agent-go
-RUN upx -1 /datadog-agent-go
+RUN if [ "$PLATFORM" = "x86_64" ]; then apt-get install -y upx=3.96-r0 && upx -1 /datadog-agent-go; fi
 
 
 RUN mkdir /extensions

scripts/Dockerfile.bottlecap.build

@@ -25,10 +25,10 @@ ARG DATADOG_WRAPPER=datadog_wrapper
 ARG GO_AGENT_PATH
 
 RUN apt-get update
-RUN apt-get install -y zip binutils upx
+RUN apt-get install -y zip binutils
 COPY .layers/$GO_AGENT_PATH/extensions/datadog-agent /datadog-agent-go
 RUN strip /datadog-agent-go
-RUN upx -1 /datadog-agent-go
+RUN if [ "$PLATFORM" = "x86_64" ]; then apt-get install -y upx=3.96-r0 && upx -1 /datadog-agent-go; fi
 
 
 RUN mkdir /extensions

scripts/Dockerfile.bottlecap.dev

@@ -23,11 +23,9 @@ FROM ubuntu:22.04 as compresser
 ARG DATADOG_WRAPPER=datadog_wrapper
 
 RUN apt-get update
-RUN apt-get install -y zip binutils upx
+RUN apt-get install -y zip binutils
 COPY --from=public.ecr.aws/datadog/lambda-extension:64 /opt/datadog-agent-go  /datadog-agent-go
-RUN du -h /datadog-agent-go
-RUN upx -1 /datadog-agent-go
-RUN du -h /datadog-agent-go
+RUN if [ "$PLATFORM" = "x86_64" ]; then apt-get install -y upx=3.96-r0 && upx -1 /datadog-agent-go; fi
 RUN mkdir /extensions
 WORKDIR /extensions