This repository has been archived by the owner on Jan 23, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 68
fix: --opbeans-node-agent-local-repo=/a/local/dir #1084
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,14 @@ | ||
#!/usr/bin/env sh | ||
set -ex | ||
if [ -f /local-install/package.json ]; then | ||
echo "Installing from local folder" | ||
# copy to folder inside container to ensure were not poluting the local folder | ||
cp -r /local-install ~ | ||
cd ~/local-install && npm install . | ||
cd - | ||
echo "Installing elastic-apm-node from local folder (--opbeans-node-agent-local-repo)" | ||
# Copy to a folder inside container to ensure we're not polluting the | ||
# local folder. Skip possibly huge dirs to speed this up. | ||
apk add rsync | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is installing rsync appropriate here? Would doing so in the Dockerfile be more appropriate? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. it is better to add packages on the Dockerfile |
||
rsync -a /local-install/ ~/local-install/ --exclude node_modules --exclude build --exclude .git | ||
# Install elastic-apm-node from this copied dir. | ||
npm install ~/local-install | ||
npm ls elastic-apm-node | ||
elif [ -n "${NODE_AGENT_VERSION}" ]; then | ||
echo "Installing ${NODE_AGENT_VERSION} from npm" | ||
npm install elastic-apm-node@"${NODE_AGENT_VERSION}" | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This
npm install .
was installing the deps for the apm-agent-nodejs copy in ~/local-install, but it wasn't installing them where the app at "/app" would use it.