From 6d7570b373f6a61c914174e3a4f063d109d1abcc Mon Sep 17 00:00:00 2001
From: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
Date: Mon, 20 Jun 2022 16:08:51 -0400
Subject: [PATCH] CI: update rocm image

---
 .gitlab-ci.yml                                |  2 +-
 .../docker/ubuntu2004/kokkos-hip/Dockerfile   | 38 +++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f4ce19d6..e9c796e90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -106,7 +106,7 @@
     - .docker_image
 
 .ubuntu2004_hip_kokkos: &ubuntu2004_hip_kokkos
-  image: "kitware/vtkm:ci-ubuntu2004_hip_kokkos-20210827"
+  image: "kitware/vtkm:ci-ubuntu2004_hip_kokkos-20220620"
   extends:
     - .docker_image
 
diff --git a/.gitlab/ci/docker/ubuntu2004/kokkos-hip/Dockerfile b/.gitlab/ci/docker/ubuntu2004/kokkos-hip/Dockerfile
index 03521a2ba..87f354c24 100644
--- a/.gitlab/ci/docker/ubuntu2004/kokkos-hip/Dockerfile
+++ b/.gitlab/ci/docker/ubuntu2004/kokkos-hip/Dockerfile
@@ -2,19 +2,20 @@ FROM rocm/dev-ubuntu-20.04
 LABEL maintainer "Vicente Adolfo Bolea Sanchez<vicente.bolea@kitware.com>"
 
 # Base dependencies for building VTK-m projects
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-      cmake \
-      curl \
-      g++ \
-      git \
-      git-lfs \
-      libmpich-dev \
-      libomp-dev \
-      mpich \
-      ninja-build \
-      rsync \
-      ssh \
-      software-properties-common
+RUN apt update && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \
+    curl \
+    g++ \
+    git \
+    git-lfs \
+    libmpich-dev \
+    libomp-dev \
+    mpich \
+    ninja-build \
+    rsync \
+    ssh \
+    && \
+    apt clean
 
 # Need to run git-lfs install manually on ubuntu based images when using the
 # system packaged version
@@ -33,11 +34,10 @@ ENV CMAKE_PREFIX_PATH "/opt/rocm/lib/cmake:/opt/rocm/lib:${CMAKE_PREFIX_PATH}"
 ENV CMAKE_GENERATOR "Ninja"
 
 # Build and install Kokkos
-ARG KOKKOS_VERSION=3.4.01
+ARG KOKKOS_VERSION=3.6.00
 COPY kokkos_cmake_config.cmake kokkos_cmake_config.cmake
 RUN curl -L https://github.com/kokkos/kokkos/archive/refs/tags/$KOKKOS_VERSION.tar.gz | tar -xzf - && \
-		cmake -S kokkos-$KOKKOS_VERSION -B build -C kokkos_cmake_config.cmake                          && \
-		cmake --build build -v                                                                         && \
-		sudo cmake --install build
-
-RUN rm -rf build
+    cmake -S kokkos-$KOKKOS_VERSION -B build -C kokkos_cmake_config.cmake                          && \
+    cmake --build build -v                                                                         && \
+    cmake --install build                                                                          && \
+    rm -rf build kokkos-$KOKKOS_VERSION