Merge branch 'develop' into hotfix/cli-runner

openmpf · May 2, 2022 · ddf2cea · ddf2cea
2 parents 92cb03e + a1796c0
commit ddf2cea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/components/cpp_component_build/Dockerfile b/components/cpp_component_build/Dockerfile
@@ -47,7 +47,7 @@ RUN --mount=type=tmpfs,target=/var/cache/apt \
         wget ca-certificates gnupg2 cmake make g++ libgtest-dev  liblog4cxx-dev libboost-dev \
         libavcodec58 libavformat58 libswscale5 libopenblas0-pthread liblapacke; \
     # Can't set up cuda repo at the beginning because it requires wget ca-certificates gnupg2
-    wget -O- https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub \
+    wget -O- https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub \
             | apt-key add -; \
     echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64 /" \
         > /etc/apt/sources.list.d/cuda.list; \

diff --git a/components/cpp_executor/Dockerfile b/components/cpp_executor/Dockerfile
@@ -46,7 +46,7 @@ RUN --mount=type=tmpfs,target=/var/cache/apt \
     apt-get install --no-install-recommends -y \
         python3.8 libpython3.8 wget ca-certificates gnupg2; \
     # Can't set up cuda repo at the beginning because it requires wget ca-certificates gnupg2
-    wget -O- https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub \
+    wget -O- https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub \
             | apt-key add -; \
     echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64 /" \
         > /etc/apt/sources.list.d/cuda.list; \

diff --git a/openmpf_build/Dockerfile b/openmpf_build/Dockerfile
@@ -55,7 +55,7 @@ RUN --mount=type=tmpfs,target=/var/cache/apt \
         libopenblas-dev liblapacke-dev libavcodec-dev libavcodec-extra libavformat-dev  \
         libavutil-dev libswscale-dev libavresample-dev libharfbuzz-dev libfreetype-dev; \
     # Can't set up cuda repo at the beginning because it requires wget ca-certificates gnupg2
-    wget -O- https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/7fa2af80.pub \
+    wget -O- https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64/3bf863cc.pub \
             | apt-key add -; \
     echo "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/x86_64 /" \
         > /etc/apt/sources.list.d/cuda.list; \