Update Java version and re-use with different format

signalfx · Jul 21, 2023 · af88054 · af88054
1 parent e5789d5
commit af88054
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cmd/otelcol/Dockerfile.windows b/cmd/otelcol/Dockerfile.windows
@@ -32,9 +32,9 @@ ARG JMX_METRIC_GATHERER_RELEASE
 RUN New-Item -Path "C:\\" -Name "opt" -ItemType "directory"
 RUN Invoke-WebRequest -Uri "https://github.com/open-telemetry/opentelemetry-java-contrib/releases/download/v${env:JMX_METRIC_GATHERER_RELEASE}/opentelemetry-jmx-metrics.jar" -Outfile "c:\opt\opentelemetry-java-contrib-jmx-metrics.jar"
 
-ARG JDK_VERSION="11.0.19_7"
+ARG JDK_VERSION="11.0.20_8"
 ARG OPENJDK_BASE_URL="https://github.com/adoptium/temurin11-binaries/releases/download"
-ENV JAVA_HOME="C:\java\jdk-11.0.19+7"
+ENV JAVA_HOME="C:\java\jdk-$JDK_VERSION.replace("_", "+")"
 ENV JAVA_PATH="$JAVA_HOME\bin"
 RUN Set-Variable -Name "ENCODED_VER" -Value "\"$env:JDK_VERSION\".replace(\"_\", \"%2B\")"; \
     Invoke-WebRequest -Uri "${env:OPENJDK_BASE_URL}/jdk-${ENCODED_VER}/OpenJDK11U-jdk_x64_windows_hotspot_${env:JDK_VERSION}.zip" -OutFile "openjdk.zip" ; \