Skip to content

feat(nri-docker-win): bundle nri-docker for windows #2024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
rajrohanyadav wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat(nri-docker-win): bundle nri-docker for windows #2024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions build/package/windows/newrelic-infra-amd64-installer/newrelic-infra/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,12 @@
Source="$(var.EmbedBinariesPath)nri-flex\nri-flex.exe"
KeyPath="yes" />
</Component>
<!-- DOCKER -->
<Component Id="CMP_DOCKER_PLUGIN" Guid="2DE6EEC7-4FD6-41BC-80E1-35721579EA40" Win64="yes">
<File Id="FILE_DOCKER_PLUGIN"
Source="$(var.EmbedBinariesPath)nri-docker\nri-docker.exe"
KeyPath="yes" />
</Component>
<!-- WINSERVICES -->
<Component Id="CMP_WINSERVICEEXP_PLUGIN" Guid="ADF9277D-5C22-4A71-B03B-747EC6DFAB5D" Win64="yes">
<File Id="FILE_WINSERVICEEXP_PLUGIN"
Expand Down
15 changes: 15 additions & 0 deletions build/windows/scripts/embed_ohis.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,20 @@ Function EmbedFlex {
}
}

# Adding nri-docker.
Function EmbedDocker {
Write-Output "--- Embedding nri-docker"

[string]$version = GetIntegrationVersion -name "nri-docker"
[string]$url="https://github.com/newrelic/nri-docker/releases/download/v${version}/nri-docker_windows_${version}_${arch}.zip"

DownloadAndExtractZip -dest:"$downloadPath\nri-docker" -url:"$url"

if (-Not $skipSigning) {
SignExecutable -executable "$downloadPath\nri-docker\nri-docker.exe"
}
}

# # Adding windows services.
Function EmbedWindowsServices {
Write-Output "--- Embedding win-services"
Expand Down Expand Up @@ -130,6 +144,7 @@ New-Item -ItemType Directory -Force -Path "$downloadPath"
Write-Output "--- Embedding external components"

EmbedFlex
EmbedDocker
EmbedWindowsServices
EmbedPrometheus
EmbedFluentBit
Expand Down
Loading