Update CI images (#8031)

* [CI] Updated docker images * fixes to build images * fix arm image version * update qemu * reset jenkinsfile
apache · May 14, 2021 · 66d35ba · 66d35ba
1 parent bd7cda9
commit 66d35ba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/docker/Dockerfile.ci_gpu b/docker/Dockerfile.ci_gpu
@@ -25,11 +25,11 @@ RUN apt-get update --fix-missing
 COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
 RUN bash /install/ubuntu_install_core.sh
 
-COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh
-RUN bash /install/ubuntu_install_python.sh
+COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh
+RUN bash /install/ubuntu1804_install_python.sh
 
-COPY install/ubuntu_install_llvm.sh /install/ubuntu_install_llvm.sh
-RUN bash /install/ubuntu_install_llvm.sh
+COPY install/ubuntu1804_install_llvm.sh /install/ubuntu1804_install_llvm.sh
+RUN bash /install/ubuntu1804_install_llvm.sh
 
 COPY install/ubuntu_install_opencl.sh /install/ubuntu_install_opencl.sh
 RUN bash /install/ubuntu_install_opencl.sh

diff --git a/docker/Dockerfile.ci_i386 b/docker/Dockerfile.ci_i386
@@ -20,8 +20,7 @@
 
 FROM ioft/i386-ubuntu:16.04
 
-RUN apt-get update --fix-missing
-RUN apt-get install -y ca-certificates
+RUN apt-get update --fix-missing && apt-get install -y ca-certificates
 
 COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh
 RUN bash /install/ubuntu_install_core.sh