Merge pull request adoptium#176 from mahdipub/issue_8331

Revert cuda workaround in Semeru builds

pipelines/build/dockerFiles/cuda.dockerfile

@@ -1,12 +1,17 @@
 ARG image
+ARG cuda_ver=12.2.0
+ARG cuda_distro=ubuntu20.04
 
-FROM $image
+FROM nvidia/cuda:${cuda_ver}-devel-${cuda_distro} as cuda
+FROM $image 
+
+# This line should be present here to let access to cuda_ver ARG in the following lines
+ARG cuda_ver
 
 # Install cuda headers https://github.com/eclipse/openj9/blob/master/buildenv/docker/mkdocker.sh#L586-L593
-RUN mkdir -p /usr/local/cuda-9.0/nvvm
+RUN mkdir -p /usr/local/cuda-$cuda_ver/nvvm
 # TEMP: Copy the header files from the local compile box to the container.
-# The Cuda 9.0 container is no longer available. See infra #8157.
-COPY cuda-9.0/include /usr/local/cuda-9.0/include
-COPY cuda-9.0/nvvm/include /usr/local/cuda-9.0/nvvm/include
+COPY --from=cuda /usr/local/cuda/include         /usr/local/cuda-${cuda_ver}/include
+COPY --from=cuda /usr/local/cuda/nvvm/include    /usr/local/cuda-${cuda_ver}/nvvm/include
 
-ENV CUDA_HOME="/usr/local/cuda-9.0"
+ENV CUDA_HOME="/usr/local/cuda-${cuda_ver}"