diff --git a/Dockerfile b/Dockerfile index 45929b2..8e78356 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,6 +31,8 @@ ARG BROWSER_AGENT_ID ARG BROWSER_APPLICATION_ID ARG FOSSA_API_KEY ARG NEW_RELIC_API_KEY +ARG NEW_RELIC_METADATA_COMMIT +ARG NEW_RELIC_METADATA_RELEASE_TAG ENV BROWSER_LICENSE_KEY=$BROWSER_LICENSE_KEY ENV BROWSER_ACCOUNT_ID=$BROWSER_ACCOUNT_ID @@ -39,6 +41,8 @@ ENV BROWSER_AGENT_ID=$BROWSER_AGENT_ID ENV BROWSER_APPLICATION_ID=$BROWSER_APPLICATION_ID ENV FOSSA_API_KEY=$FOSSA_API_KEY ENV NEW_RELIC_API_KEY=$NEW_RELIC_API_KEY +ENV NEW_RELIC_METADATA_COMMIT=$NEW_RELIC_METADATA_COMMIT +ENV NEW_RELIC_METADATA_RELEASE_TAG=$NEW_RELIC_METADATA_RELEASE_TAG RUN --mount=type=cache,target=/root/.gradle ./gradlew downloadNewRelicAgent --console=plain --info --no-daemon --no-watch-fs RUN --mount=type=cache,target=/root/.gradle ./gradlew build --console=plain --info --no-daemon --no-watch-fs @@ -57,11 +61,12 @@ RUN if [ -z "$FOSSA_API_KEY" ] ; then \ RUN if [ -z "$NEW_RELIC_API_KEY" ] ; then \ echo --SKIPPING SOURCE MAP UPLOAD ; \ else \ - filename=$(ls /client/dist/assets/*.js | grep -v '.map.js' | xargs -n 1 basename) && \ - echo "JavaScript file is: $filename" && \ + filename=$(ls ./client/dist/assets/*.js | grep -v '.map.js' | xargs -n 1 basename) && \ curl -H "Api-Key: $NEW_RELIC_API_KEY" \ - -F "sourcemap=/client/dist/assets/$filename.map" \ + -F "sourcemap=@client/dist/assets/$filename.map" \ -F "javascriptUrl=https://petclinic-demogorgon.staging-service.nr-ops.net/react/assets/$filename" \ + -F "buildCommit=$NEW_RELIC_METADATA_COMMIT" \ + -F "releaseName=$NEW_RELIC_METADATA_RELEASE_TAG" \ https://sourcemaps.service.newrelic.com/v2/applications/$BROWSER_APPLICATION_ID/sourcemaps ;\ fi