Skip to content

Commit

Permalink
fix Dockerfile path
Browse files Browse the repository at this point in the history
  • Loading branch information
Kav91 committed Sep 9, 2019
1 parent c193069 commit f4b3c58
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#build linux binary first
FROM newrelic/infrastructure
FROM newrelic/infrastructure:1.5.0
ENV NRIA_IS_FORWARD_ONLY true

COPY configs/nri-docker-config.yml /etc/newrelic-infra/integrations.d/
COPY configs/nri-docker-def-linux.yml /var/db/newrelic-infra/custom-integrations/

#update binary path if required
COPY ./bin/linuxnri-docker /var/db/newrelic-infra/custom-integrations/
COPY ./bin/linux/nri-docker /var/db/newrelic-infra/custom-integrations/
2 changes: 1 addition & 1 deletion build/package/create-tar.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ mkdir -p ${BUILD_DIR}

cp ./bin/${OS}/* ${BUILD_DIR}/
cp ./README.md ${BUILD_DIR}/
cp ./Dockerfile ${BUILD_DIR}/
[ -f "./scripts/install_${OS}.sh" ] && cp ./scripts/install_${OS}.sh ${BUILD_DIR}/
[ -f "./scripts/install_${OS}.bat" ] && cp ./scripts/install_${OS}.bat ${BUILD_DIR}/
cp ./configs/nri-docker-config.yml ${BUILD_DIR}/
cp ./configs/nri-docker-def-${OS}.yml ${BUILD_DIR}/${COMMAND}-definition.yml
cp ./configs/Dockerfile-${OS} ${BUILD_DIR}/Dockerfile

# Create the gzip
tar -C ${TEMPDIR} -czf ${OUTPUT_NAME}.tar.gz ${OUTPUT_NAME}/
Expand Down
9 changes: 9 additions & 0 deletions configs/Dockerfile-linux
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#build linux binary first
FROM newrelic/infrastructure:1.5.0
ENV NRIA_IS_FORWARD_ONLY true

COPY nri-docker-config.yml /etc/newrelic-infra/integrations.d/
COPY nri-docker-def-linux.yml /var/db/newrelic-infra/custom-integrations/

#update binary path if required
COPY ./nri-docker /var/db/newrelic-infra/custom-integrations/

0 comments on commit f4b3c58

Please sign in to comment.