Skip to content

Commit 2d31cc6

Browse files
committed
feat(nri-docker-win): bundle nri-docker for windows
1 parent defe0d3 commit 2d31cc6

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

build/package/windows/newrelic-infra-amd64-installer/newrelic-infra/Product.wxs

+6
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,12 @@
330330
Source="$(var.EmbedBinariesPath)nri-flex\nri-flex.exe"
331331
KeyPath="yes" />
332332
</Component>
333+
<!-- DOCKER -->
334+
<Component Id="CMP_DOCKER_PLUGIN" Guid="2DE6EEC7-4FD6-41BC-80E1-35721579EA40" Win64="yes">
335+
<File Id="FILE_DOCKER_PLUGIN"
336+
Source="$(var.EmbedBinariesPath)nri-docker\nri-docker.exe"
337+
KeyPath="yes" />
338+
</Component>
333339
<!-- WINSERVICES -->
334340
<Component Id="CMP_WINSERVICEEXP_PLUGIN" Guid="ADF9277D-5C22-4A71-B03B-747EC6DFAB5D" Win64="yes">
335341
<File Id="FILE_WINSERVICEEXP_PLUGIN"

build/windows/scripts/embed_ohis.ps1

+15
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,20 @@ Function EmbedFlex {
3131
}
3232
}
3333

34+
# Adding nri-docker.
35+
Function EmbedDocker {
36+
Write-Output "--- Embedding nri-docker"
37+
38+
[string]$version = GetIntegrationVersion -name "nri-docker"
39+
[string]$url="https://github.com/newrelic/nri-docker/releases/download/v${version}/nri-docker_windows_${version}_${arch}.zip"
40+
41+
DownloadAndExtractZip -dest:"$downloadPath\nri-docker" -url:"$url"
42+
43+
if (-Not $skipSigning) {
44+
SignExecutable -executable "$downloadPath\nri-docker\nri-docker.exe"
45+
}
46+
}
47+
3448
# # Adding windows services.
3549
Function EmbedWindowsServices {
3650
Write-Output "--- Embedding win-services"
@@ -130,6 +144,7 @@ New-Item -ItemType Directory -Force -Path "$downloadPath"
130144
Write-Output "--- Embedding external components"
131145

132146
EmbedFlex
147+
EmbedDocker
133148
EmbedWindowsServices
134149
EmbedPrometheus
135150
EmbedFluentBit

0 commit comments

Comments
 (0)