NR-160489: move bins to /opt (#1742)

* NR-160489: move bins to /opt * update tests * remove manual packaging tests * add opt to the tarballs
newrelic · Oct 20, 2023 · 46ecab6 · 46ecab6
1 parent d515e30
commit 46ecab6
Show file tree

Hide file tree

Showing 77 changed files with 321 additions and 1,315 deletions.
diff --git a/.github/workflows/prerelease_linux_on_demand.yml b/.github/workflows/prerelease_linux_on_demand.yml
@@ -6,13 +6,17 @@ on:
       branch:
         description: 'Branch to build from'
         required: true
+      fake_tag:
+        description: 'Version to be given to the packages'
+        default: '0.0.0'
       dest_prefix:
         description: 'Repo prefix'
         required: true
 
 env:
   GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  TAG: "0.0.0"
+  TAG: ${{ inputs.fake_tag }}
+  FAKE_TAG:  ${{ inputs.fake_tag }}
   DOCKER_HUB_ID: ${{secrets.OHAI_DOCKER_HUB_ID}}
   DOCKER_HUB_PASSWORD: ${{secrets.OHAI_DOCKER_HUB_PASSWORD}}
   # required for GHA publish action, should be moved into optional
@@ -43,7 +47,7 @@ jobs:
           ref: ${{ env.BRANCH }}
 
       - name: "Tag this commit" # required for Goreleaser
-        run: git tag ${{ env.TAG }}
+        run: git tag ${{ env.FAKE_TAG }}
 
       - name: Login to DockerHub
         uses: docker/login-action@v1
@@ -53,6 +57,8 @@ jobs:
 
       - name: Preparing all linux packages
         run: make ci/prerelease/linux
+        env:
+          TAG: ${{ env.FAKE_TAG }}
 
       - name: Generate checksum files
         uses: ./.github/actions/generate-checksums
@@ -64,7 +70,7 @@ jobs:
       - name: Publish deb to S3 action
         uses: newrelic/infrastructure-publish-action@v1.3.4
         with:
-          tag: ${{env.TAG}}
+          tag: ${{env.FAKE_TAG}}
           app_name: "newrelic-infra"
           repo_name: "newrelic/infrastructure-agent"
           schema: "custom"
@@ -89,7 +95,7 @@ jobs:
       - name: Publish rpm to S3 action
         uses: newrelic/infrastructure-publish-action@v1.3.4
         with:
-          tag: ${{env.TAG}}
+          tag: ${{env.FAKE_TAG}}
           app_name: "newrelic-infra"
           repo_name: "newrelic/infrastructure-agent"
           schema: "custom"
@@ -113,7 +119,7 @@ jobs:
       - name: Publish targz to S3 action
         uses: newrelic/infrastructure-publish-action@v1.3.4
         with:
-          tag: ${{env.TAG}}
+          tag: ${{env.FAKE_TAG}}
           app_name: "newrelic-infra"
           repo_name: "newrelic/infrastructure-agent"
           schema: "custom"

diff --git a/build/fix_tarballs_linux.sh b/build/fix_tarballs_linux.sh
@@ -16,6 +16,7 @@ for tarball_dirty in $(find dist -regex ".*linux.*_dirty\.\(tar.gz\)");do
   mkdir -p ${tarballContentPath}/usr/bin
   mkdir -p ${tarballContentPath}/var/{db/newrelic-infra,log/newrelic-infra,run/newrelic-infra}
   mkdir -p ${tarballContentPath}/var/db/newrelic-infra/{custom-integrations,integrations.d,newrelic-integrations}
+  mkdir -p ${tarballContentPath}/opt/newrelic-infra/{custom-integrations,newrelic-integrations}
 
   echo "===> Decompress ${tarball} in ${tarballContentPath}"
   tar -xvf ${tarball_dirty} -C ${tarballContentPath}

diff --git a/build/goreleaser/linux/al2023_amd64.yml b/build/goreleaser/linux/al2023_amd64.yml
@@ -35,16 +35,18 @@
         dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
         type: config
       - src: 'target/nridocker/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
       - src: 'target/nriflex/amd64/nri-flex'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
       - src: 'target/nriprometheus/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
       - src: 'target/fluent-bit-plugin/amd64/out_newrelic.so'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
       - src: 'assets/examples/logging/parsers.conf'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
     empty_folders:
+      - /opt/newrelic-infra/custom-integrations
+      - /opt/newrelic-infra/newrelic-integrations
       - /var/db/newrelic-infra/custom-integrations
       - /var/db/newrelic-infra/integrations.d
       - /var/log/newrelic-infra

diff --git a/build/goreleaser/linux/al2023_arm.yml b/build/goreleaser/linux/al2023_arm.yml
@@ -36,16 +36,18 @@
         type: config
 
       - src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
       - src: 'target/nriflex/{{ .Arch }}/nri-flex'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
       - src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
     #      - src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
     #        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
     #      - src: 'assets/examples/logging/parsers.conf'
     #        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
     empty_folders:
+      - /opt/newrelic-infra/custom-integrations
+      - /opt/newrelic-infra/newrelic-integrations
       - /var/db/newrelic-infra/custom-integrations
       - /var/db/newrelic-infra/integrations.d
       - /var/log/newrelic-infra

diff --git a/build/goreleaser/linux/al2023_arm64.yml b/build/goreleaser/linux/al2023_arm64.yml
@@ -35,16 +35,18 @@
         dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
         type: config
       - src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
       - src: 'target/nriflex/{{ .Arch }}/nri-flex'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
       - src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
       - src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
       - src: 'assets/examples/logging/parsers.conf'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
     empty_folders:
+      - /opt/newrelic-infra/custom-integrations
+      - /opt/newrelic-infra/newrelic-integrations
       - /var/db/newrelic-infra/custom-integrations
       - /var/db/newrelic-infra/integrations.d
       - /var/log/newrelic-infra

diff --git a/build/goreleaser/linux/al2_amd64.yml b/build/goreleaser/linux/al2_amd64.yml
@@ -35,16 +35,18 @@
         dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
         type: config
       - src: 'target/nridocker/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
       - src: 'target/nriflex/amd64/nri-flex'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
       - src: 'target/nriprometheus/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
       - src: 'target/fluent-bit-plugin/amd64/out_newrelic.so'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
       - src: 'assets/examples/logging/parsers.conf'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
     empty_folders:
+      - /opt/newrelic-infra/custom-integrations
+      - /opt/newrelic-infra/newrelic-integrations
       - /var/db/newrelic-infra/custom-integrations
       - /var/db/newrelic-infra/integrations.d
       - /var/log/newrelic-infra

diff --git a/build/goreleaser/linux/al2_arm.yml b/build/goreleaser/linux/al2_arm.yml
@@ -36,16 +36,18 @@
         type: config
 
       - src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
       - src: 'target/nriflex/{{ .Arch }}/nri-flex'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
       - src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
     #      - src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
     #        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
     #      - src: 'assets/examples/logging/parsers.conf'
     #        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
     empty_folders:
+      - /opt/newrelic-infra/custom-integrations
+      - /opt/newrelic-infra/newrelic-integrations
       - /var/db/newrelic-infra/custom-integrations
       - /var/db/newrelic-infra/integrations.d
       - /var/log/newrelic-infra

diff --git a/build/goreleaser/linux/al2_arm64.yml b/build/goreleaser/linux/al2_arm64.yml
@@ -35,16 +35,18 @@
         dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
         type: config
       - src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
       - src: 'target/nriflex/{{ .Arch }}/nri-flex'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
       - src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
       - src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
       - src: 'assets/examples/logging/parsers.conf'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
     empty_folders:
+      - /opt/newrelic-infra/custom-integrations
+      - /opt/newrelic-infra/newrelic-integrations
       - /var/db/newrelic-infra/custom-integrations
       - /var/db/newrelic-infra/integrations.d
       - /var/log/newrelic-infra

diff --git a/build/goreleaser/linux/centos_6_amd64.yml b/build/goreleaser/linux/centos_6_amd64.yml
@@ -23,11 +23,11 @@
         type: config
 
       - src: 'target/nridocker/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
       - src: 'target/nriflex/amd64/nri-flex'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
       - src: 'target/nriprometheus/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
 
       # Upstart service conf file
       - src: 'build/package/upstart/newrelic-infra'
@@ -39,6 +39,8 @@
         dst: /etc/init.d/newrelic-infra
         type: "symlink"
     empty_folders:
+      - /opt/newrelic-infra/custom-integrations
+      - /opt/newrelic-infra/newrelic-integrations
       - /var/db/newrelic-infra/custom-integrations
       - /var/db/newrelic-infra/integrations.d
       - /var/log/newrelic-infra

diff --git a/build/goreleaser/linux/centos_7_amd64.yml b/build/goreleaser/linux/centos_7_amd64.yml
@@ -35,16 +35,18 @@
         dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
         type: config
       - src: 'target/nridocker/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
       - src: 'target/nriflex/amd64/nri-flex'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
       - src: 'target/nriprometheus/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
       - src: 'target/fluent-bit-plugin/amd64/out_newrelic.so'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
       - src: 'assets/examples/logging/parsers.conf'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
     empty_folders:
+      - /opt/newrelic-infra/custom-integrations
+      - /opt/newrelic-infra/newrelic-integrations
       - /var/db/newrelic-infra/custom-integrations
       - /var/db/newrelic-infra/integrations.d
       - /var/log/newrelic-infra

diff --git a/build/goreleaser/linux/centos_7_arm.yml b/build/goreleaser/linux/centos_7_arm.yml
@@ -35,16 +35,18 @@
         dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
         type: config
       - src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
       - src: 'target/nriflex/{{ .Arch }}/nri-flex'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
       - src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
     #      - src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
     #        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
     #      - src: 'assets/examples/logging/parsers.conf'
     #        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
     empty_folders:
+      - /opt/newrelic-infra/custom-integrations
+      - /opt/newrelic-infra/newrelic-integrations
       - /var/db/newrelic-infra/custom-integrations
       - /var/db/newrelic-infra/integrations.d
       - /var/log/newrelic-infra

diff --git a/build/goreleaser/linux/centos_7_arm64.yml b/build/goreleaser/linux/centos_7_arm64.yml
@@ -35,16 +35,18 @@
         dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
         type: config
       - src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
       - src: 'target/nriflex/{{ .Arch }}/nri-flex'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
       - src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
       - src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
       - src: 'assets/examples/logging/parsers.conf'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
     empty_folders:
+      - /opt/newrelic-infra/custom-integrations
+      - /opt/newrelic-infra/newrelic-integrations
       - /var/db/newrelic-infra/custom-integrations
       - /var/db/newrelic-infra/integrations.d
       - /var/log/newrelic-infra

diff --git a/build/goreleaser/linux/centos_8_amd64.yml b/build/goreleaser/linux/centos_8_amd64.yml
@@ -35,16 +35,18 @@
         dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
         type: config
       - src: 'target/nridocker/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
       - src: 'target/nriflex/amd64/nri-flex'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
       - src: 'target/nriprometheus/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
       - src: 'target/fluent-bit-plugin/amd64/out_newrelic.so'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
       - src: 'assets/examples/logging/parsers.conf'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
     empty_folders:
+      - /opt/newrelic-infra/custom-integrations
+      - /opt/newrelic-infra/newrelic-integrations
       - /var/db/newrelic-infra/custom-integrations
       - /var/db/newrelic-infra/integrations.d
       - /var/log/newrelic-infra

diff --git a/build/goreleaser/linux/centos_8_arm.yml b/build/goreleaser/linux/centos_8_arm.yml
@@ -35,16 +35,18 @@
         dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
         type: config
       - src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
       - src: 'target/nriflex/{{ .Arch }}/nri-flex'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
       - src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
     #      - src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
     #        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
     #      - src: 'assets/examples/logging/parsers.conf'
     #        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
     empty_folders:
+      - /opt/newrelic-infra/custom-integrations
+      - /opt/newrelic-infra/newrelic-integrations
       - /var/db/newrelic-infra/custom-integrations
       - /var/db/newrelic-infra/integrations.d
       - /var/log/newrelic-infra

diff --git a/build/goreleaser/linux/centos_8_arm64.yml b/build/goreleaser/linux/centos_8_arm64.yml
@@ -35,16 +35,18 @@
         dst: '/etc/newrelic-infra/integrations.d/docker-config.yml'
         type: config
       - src: 'target/nridocker/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-docker'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-docker'
       - src: 'target/nriflex/{{ .Arch }}/nri-flex'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-flex'
       - src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
-        dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
+        dst: '/opt/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
       - src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
       - src: 'assets/examples/logging/parsers.conf'
         dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
     empty_folders:
+      - /opt/newrelic-infra/custom-integrations
+      - /opt/newrelic-infra/newrelic-integrations
       - /var/db/newrelic-infra/custom-integrations
       - /var/db/newrelic-infra/integrations.d
       - /var/log/newrelic-infra