Update instructions to adopt new file paths

Author: prasad-1210

Dockerfile-tomcat-temurin-jre

@@ -1,27 +1,28 @@
+# docker build -t prasad1210/tomcat-custom:9.0.70.0-alpine-jre-17.0.5_8 . -f Dockerfile-tomcat-temurin-jre --no-cache
 FROM alpine:latest AS stage-0
 
-# Download jdk binary from temurin github (in future add sha checksum verification)
+# Download jdk binary from temurin github and verify sha256 checksum
 # Use jlink and we can use it remove more default modules and reduce image size
 
 # see https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/KEYS
 # see also "update.sh" (https://github.com/docker-library/tomcat/blob/master/update.sh)
 # ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV JDK_MAJOR 17
-ENV JDK_VERSION 17_35
-ENV JDK_DOWNLOAD_URL https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17%2B35/OpenJDK17-jdk_x64_alpine-linux_hotspot_17_35.tar.gz
-ENV JDK_SHA512_URL   https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17%2B35/OpenJDK17-jdk_x64_alpine-linux_hotspot_17_35.tar.gz.sha256.txt
-# https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17%2B35/OpenJDK17-jdk_x64_alpine-linux_hotspot_17_35.tar.gz.sha256.txt
-# ENV TOMCAT_SHA512 307ca646bac267e529fb0862278f7133fe80813f0af64a44aed949f4c7a9a98aeb9bd7f08b087645b40c6fefdd3a7fe519e4858a3dbf0a19c38c53704f92b575
+ENV JDK_VERSION 17.0.5_8
+#                    https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.5_8.tar.gz
+ENV JDK_DOWNLOAD_URL https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.5_8.tar.gz
+ENV JDK_SHA256_URL   https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.5%2B8/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.5_8.tar.gz.sha256.txt
 
 WORKDIR /root
 
 # Download JDK
 RUN set -eux;\
-    mkdir -p target/alpine-linux/x64/hotspot/ \
-    && wget "$JDK_DOWNLOAD_URL" -qO target/alpine-linux/x64/hotspot/OpenJDK17-jdk_x64_alpine-linux_hotspot_${JDK_VERSION}.tar.gz\
-#    && wget -qO- "$JDK_SHA512_URL" | sha512sum -c -\
-    && tar -xf target/alpine-linux/x64/hotspot/OpenJDK17-jdk_x64_alpine-linux_hotspot_${JDK_VERSION}.tar.gz --strip-components=1
+    mkdir -p target/alpine-linux/x64/temurin/ \
+    && wget "$JDK_DOWNLOAD_URL" -qO target/alpine-linux/x64/temurin/OpenJDK17U-jdk_x64_alpine-linux_hotspot_${JDK_VERSION}.tar.gz\
+    && wget -qO- "$JDK_SHA256_URL" | sha256sum -c -\
+    && tar -xf target/alpine-linux/x64/temurin/OpenJDK17U-jdk_x64_alpine-linux_hotspot_${JDK_VERSION}.tar.gz --strip-components=1
+
 
 RUN set -eux \
     && ./bin/jlink --output /usr/lib/jvm/default-jvm/jre/bin/jre --compress=2 --no-header-files --no-man-pages --strip-java-debug-attributes --module-path ../jmods --add-modules jdk.xml.dom,java.management,java.management.rmi,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.se,java.security.jgss,java.security.sasl,java.smartcardio,java.sql,java.sql.rowset,java.transaction.xa,java.xml,java.xml.crypto
@@ -32,7 +33,7 @@ ENV OS_RELEASE="Alpine Linux v3.14.2"
 
 # Installed main dependencies:
 #  ca-certificates-20191127-r5 x86_64: for certificate management to support SSL
-#  openjdk11: OpenJDK 64-Bit Server VM Temurin-17+35 (build 17+35, mixed mode)
+#  openjdk11: OpenJDK 64-Bit Server VM Temurin-17.0.5+8 (build 17.0.5+8, mixed mode)
 #  fontconfig-2.13.1-r4 x86_64 : For supporting UI/ Fonts for reporting purposes
 #  freetype-2.10.4-r1 x86_64: To support freetype fonts
 #  Tomcat: Java Runtime Container
@@ -42,7 +43,7 @@ ENV OS_RELEASE="Alpine Linux v3.14.2"
 ENV JRE_HOME=/usr/lib/jvm/default-jvm/jre
 COPY --from=stage-0 /usr/lib/jvm/default-jvm/jre/bin/jre ${JRE_HOME}
 ENV PATH=${JRE_HOME}/bin:$PATH
-ENV JAVA_VERSION=17+35
+ENV JAVA_VERSION=17.0.5+8
 
 RUN set -eux;\
 
@@ -89,7 +90,7 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
 ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
 
 ENV TOMCAT_MAJOR 9
-ENV TOMCAT_VERSION 9.0.54
+ENV TOMCAT_VERSION 9.0.70
 ENV TOMCAT_DOWNLOAD_URL https://downloads.apache.org/tomcat/tomcat-${TOMCAT_MAJOR}/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz
 ENV TOMCAT_SHA512_URL https://downloads.apache.org/tomcat/tomcat-${TOMCAT_MAJOR}/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512
 # https://downloads.apache.org/tomcat/tomcat-${TOMCAT_MAJOR}/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz.sha512
@@ -157,4 +158,4 @@ USER 61000
 
 EXPOSE 8080
 
-CMD [ "catalina.sh", "run" ]
+CMD [ "catalina.sh", "run" ]