From 49a2492362e55ba8c336e77c2eca34c4ae83842b Mon Sep 17 00:00:00 2001
From: Misha Chornyi <99709299+mc-nv@users.noreply.github.com>
Date: Fri, 9 Dec 2022 09:00:29 -0800
Subject: [PATCH] Update Windows dockerfile (#5153)

---
 Dockerfile.win10.min | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Dockerfile.win10.min b/Dockerfile.win10.min
index c57e06506d..26812def15 100644
--- a/Dockerfile.win10.min
+++ b/Dockerfile.win10.min
@@ -100,27 +100,28 @@ ARG TENSORRT_ZIP="TensorRT-${TENSORRT_VERSION}.Windows10.x86_64.cuda-11.8.cudnn8
 
 LABEL TENSORRT_VERSION="${TENSORRT_VERSION}"
 
-ARG CUDNN_VERSION=8.7.0.80
+ARG CUDNN_VERSION=8.7.0.84
 ARG CUDNN_ZIP=cudnn-windows-x86_64-${CUDNN_VERSION}_cuda11-archive.zip
 
 LABEL CUDNN_VERSION="${CUDNN_VERSION}"
 
 ADD https://developer.download.nvidia.com/compute/cuda/${CUDA_VERSION}/network_installers/cuda_${CUDA_VERSION}_windows_network.exe cuda_${CUDA_VERSION}_windows_network.exe
-COPY ${CUDNN_ZIP} .
-COPY ${TENSORRT_ZIP} .
+COPY ${CUDNN_ZIP} /tmp/${CUDNN_ZIP}
+COPY ${TENSORRT_ZIP} /tmp/${TENSORRT_ZIP}
 
 LABEL CUDA_VERSION="${CUDA_VERSION}"
 
-RUN unzip %TENSORRT_ZIP%
+RUN unzip /tmp/%TENSORRT_ZIP%
 RUN move TensorRT-* TensorRT
 ENV TRT_VERSION ${TENSORRT_VERSION}
 
 RUN cuda_%CUDA_VERSION%_windows_network.exe -s %CUDA_PACKAGES%
 
-RUN unzip %CUDNN_ZIP% -d cudnn
-RUN copy cudnn\libcudnn\bin\cudnn*.dll "%CUDA_INSTALL_ROOT_WP%\bin\."
-RUN copy cudnn\libcudnn_dev\lib\x64\cudnn*.lib "%CUDA_INSTALL_ROOT_WP%\lib\x64\."
-RUN copy cudnn\libcudnn_dev\include\cudnn*.h "%CUDA_INSTALL_ROOT_WP%\include\."
+RUN unzip /tmp/%CUDNN_ZIP% 
+RUN move cudnn-* cudnn
+RUN copy cudnn\bin\cudnn*.dll "%CUDA_INSTALL_ROOT_WP%\bin\."
+RUN copy cudnn\lib\x64\cudnn*.lib "%CUDA_INSTALL_ROOT_WP%\lib\x64\."
+RUN copy cudnn\include\cudnn*.h "%CUDA_INSTALL_ROOT_WP%\include\."
 ENV CUDNN_VERSION ${CUDNN_VERSION}