Remove upx as we don't need the size decrease

OctopusDeploy · Mar 19, 2024 · 901a0e6 · 901a0e6
1 parent 49253f0
commit 901a0e6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 19 deletions.
diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json
@@ -200,10 +200,6 @@
         "TestRuntime": {
           "type": "string"
         },
-        "UpxVersion": {
-          "type": "string",
-          "description": "The version of upx to use when building the bootstrapRunner executable for the Kubernetes Tentacle"
-        },
         "Verbosity": {
           "type": "string",
           "description": "Logging verbosity during build execution. Default is 'Normal'",

diff --git a/build/Build.Pack.cs b/build/Build.Pack.cs
@@ -31,8 +31,6 @@ partial class Build
         Name = "DockerPlatform")]
     string DockerPlatform = "linux/arm64,linux/amd64";
 
-    [Parameter("The version of upx to use when building the bootstrapRunner executable for the Kubernetes Tentacle")] string UpxVersion = "4.2.2";
-
     [PublicAPI]
     Target PackOsxTarballs => _ => _
         .Description("Packs the OS/X tarballs containing the published binaries.")
@@ -562,7 +560,7 @@ void BuildAndPushOrLoadKubernetesTentacleContainerImage(bool push, bool load, st
                 tag += "-debug";
 
             settings = settings
-                .AddBuildArg($"BUILD_NUMBER={FullSemVer}", $"BUILD_DATE={DateTime.UtcNow:O}", $"UPX_VERSION={UpxVersion}")
+                .AddBuildArg($"BUILD_NUMBER={FullSemVer}", $"BUILD_DATE={DateTime.UtcNow:O}")
                 .SetPlatform(DockerPlatform)
                 .SetTag(tag)
                 .SetFile(dockerfile)

diff --git a/docker/kubernetes-tentacle/Dockerfile b/docker/kubernetes-tentacle/Dockerfile
@@ -2,24 +2,12 @@ FROM golang:1.22 as bootstrapRunnerBuilder
 
 ARG TARGETARCH
 ARG TARGETOS
-ARG UPX_VERSION="4.2.2"
 
 COPY docker/kubernetes-tentacle/bootstrapRunner/* /bootstrapRunner/
 WORKDIR /bootstrapRunner
 
-# need to install xz-utils to unpack upx
-RUN apt update
-RUN apt install -y xz-utils
-
-#download upx and unpack
-RUN curl -OL "https://github.com/upx/upx/releases/download/v${UPX_VERSION}/upx-${UPX_VERSION}-${TARGETARCH}_${TARGETOS}.tar.xz"
-RUN tar -x -f "upx-${UPX_VERSION}-${TARGETARCH}_${TARGETOS}.tar.xz"
-
-# build bootstrapRunner
 # Note: the given ldflags remove debug symbols
 RUN go build -ldflags "-s -w" -o "bin/bootstrapRunner"
-# upx reduces the size of the exe
-RUN "./upx-${UPX_VERSION}-${TARGETARCH}_${TARGETOS}/upx" "bin/bootstrapRunner"
 
 FROM mcr.microsoft.com/dotnet/runtime-deps:6.0