Skip to content

Commit

Permalink
Remove dockerfile for startup hooks and associated build target (#2342)
Browse files Browse the repository at this point in the history
  • Loading branch information
Mpdreamz authored May 23, 2024
1 parent 806b49f commit 60f34fb
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 23 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
12 changes: 0 additions & 12 deletions build/docker/Dockerfile

This file was deleted.

7 changes: 0 additions & 7 deletions build/scripts/Build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 0 additions & 4 deletions build/scripts/Targets.fs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 60f34fb

Please sign in to comment.