From 60f34fba866b4ecce187a3cecdd6916acc864fda Mon Sep 17 00:00:00 2001
From: Martijn Laarman <Mpdreamz@gmail.com>
Date: Thu, 23 May 2024 10:41:10 +0200
Subject: [PATCH] Remove dockerfile for startup hooks and associated build
 target (#2342)

---
 .github/workflows/release.yml |  1 +
 build/docker/Dockerfile       | 12 ------------
 build/scripts/Build.fs        |  7 -------
 build/scripts/Targets.fs      |  4 ----
 4 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 build/docker/Dockerfile

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d419ce01a..ceca035a9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -56,6 +56,7 @@ jobs:
       run: |
         docker build . -t docker.elastic.co/observability/apm-agent-dotnet:${{ steps.bootstrap.outputs.agent-version }} \
             --build-arg AGENT_ZIP_FILE=build/output/elastic_apm_profiler_${{ steps.bootstrap.outputs.agent-version }}-linux-x64.zip
+        
     - name: Push Profiler Docker Image
       continue-on-error: true #continue for now until we see it working in action
       run: |
diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
deleted file mode 100644
index 83abf7b3b..000000000
--- a/build/docker/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-# Builds a docker image containing all of the assemblies needed to
-# auto instrument the APM agent using startup hooks.
-#
-# Assumes that the agent 
-
-FROM busybox
-
-RUN mkdir /usr/agent
-
-# Assumes that the agent directory has been built.
-# Run build.[bat|sh] agent-zip to build it
-COPY . /usr/agent
\ No newline at end of file
diff --git a/build/scripts/Build.fs b/build/scripts/Build.fs
index fedf1bf9a..b4aae79ed 100644
--- a/build/scripts/Build.fs
+++ b/build/scripts/Build.fs
@@ -249,13 +249,6 @@ module Build =
         ZipFile.CreateFromDirectory(agentDir.FullName, Paths.BuildOutput versionedName + ".zip")
       
       
-    /// Builds docker image including the ElasticApmAgent  
-    let AgentDocker() =
-        let agentVersion = Versioning.CurrentVersion.FileVersion.ToString()        
-        
-        Docker.Exec [ "build"; "--file"; "./build/docker/Dockerfile";
-                      "--tag"; sprintf "observability/apm-agent-dotnet:%s" agentVersion; "./build/output/ElasticApmAgent" ]
-        
     let ProfilerIntegrations () =
         DotNet.Exec ["run"; "--project"; Paths.ProfilerProjFile "Elastic.Apm.Profiler.IntegrationsGenerator"; "--"
                      "-i"; Paths.SrcProfiler "Elastic.Apm.Profiler.Managed/bin/Release/netstandard2.0/Elastic.Apm.Profiler.Managed.dll"
diff --git a/build/scripts/Targets.fs b/build/scripts/Targets.fs
index 59e6dfd6b..0c20fd028 100644
--- a/build/scripts/Targets.fs
+++ b/build/scripts/Targets.fs
@@ -122,10 +122,6 @@ module Main =
                 Build.AgentZip()
             )
             
-            Targets.Target("agent-docker", ["agent-zip"], fun _ ->
-                Build.AgentDocker()
-            )   
-            
             Targets.Target("release-notes", fun _ ->
                 let version = cmdLine.ValueForOption<string>("version")
                 let currentVersion = Versioning.CurrentVersion.AssemblyVersion