Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Dockerfile.windows with changes missed in #607. #640

Merged
merged 2 commits into from
Jun 1, 2022
Merged

Update Dockerfile.windows with changes missed in #607. #640

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7411f6b
Update Dockerfile.windows with changes missed in #607.
jkschulz May 31, 2022
4290abf
Merge branch 'master' into jkschulz-windows-build-fix
jkschulz Jun 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Dockerfile.windows
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ RUN cmake --build . --config Release; `
FROM base as javacontrib

# Both of these are necessary for the nebula release plugin's options
COPY BUILD_CONFIG /work/BUILD_CONFIG
COPY .git /work/.git

ADD https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.12_7.msi /local/jdk-11-windows-x64.msi
Expand All @@ -139,9 +138,8 @@ WORKDIR /work/submodules/opentelemetry-java-contrib

# Build & test systems do not always check out git history for submodules, so the properties assigned
# here allow the nebula release process to function properly in that state
RUN Get-Content /work/BUILD_CONFIG | Where-Object length | ForEach-Object { Invoke-Expression "`$env:$_" }; `
./gradlew --no-daemon :jmx-metrics:build \"-Pgit.root=$pwd/../../.git\" \"-Prelease.version=$env:JMX_METRICS_JAR_VERSION\" \"-Prelease.disableGitChecks=true\"; `
Copy-Item -Path jmx-metrics/build/libs/opentelemetry-jmx-metrics-$env:JMX_METRICS_JAR_VERSION.jar -Destination /work/out/bin/opentelemetry-java-contrib-jmx-metrics.jar;
RUN ./gradlew --no-daemon :jmx-metrics:build; `
Copy-Item -Path jmx-metrics/build/libs/opentelemetry-jmx-metrics-*-SNAPSHOT.jar -Destination /work/out/bin/opentelemetry-java-contrib-jmx-metrics.jar;

###############################################################################
# Build Go code in one container to exploit Go build caching
Expand Down