perhaps default image can't run docker anymore?

dingiso · Mar 27, 2022 · 519f6fa · 519f6fa
1 parent 3ed2e0c
commit 519f6fa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,8 @@ version: 2
 jobs:
   build_linux_64_c_compiler_version10cxx_compiler_version10linux_clang_version11:
     working_directory: ~/test
-    machine: true
+    machine:
+      image: ubuntu-2004:202111-02
     environment:
       - CONFIG: "linux_64_c_compiler_version10cxx_compiler_version10linux_clang_version11"
       - UPLOAD_PACKAGES: "False"
@@ -32,7 +33,8 @@ jobs:
             ./.scripts/run_docker_build.sh
   build_linux_64_c_compiler_version10cxx_compiler_version10linux_clang_version13:
     working_directory: ~/test
-    machine: true
+    machine:
+      image: ubuntu-2004:202111-02
     environment:
       - CONFIG: "linux_64_c_compiler_version10cxx_compiler_version10linux_clang_version13"
       - UPLOAD_PACKAGES: "False"
@@ -57,7 +59,8 @@ jobs:
             ./.scripts/run_docker_build.sh
   build_linux_64_c_compiler_version11cxx_compiler_version11linux_clang_version11:
     working_directory: ~/test
-    machine: true
+    machine:
+      image: ubuntu-2004:202111-02
     environment:
       - CONFIG: "linux_64_c_compiler_version11cxx_compiler_version11linux_clang_version11"
       - UPLOAD_PACKAGES: "False"
@@ -82,7 +85,8 @@ jobs:
             ./.scripts/run_docker_build.sh
   build_linux_64_c_compiler_version11cxx_compiler_version11linux_clang_version13:
     working_directory: ~/test
-    machine: true
+    machine:
+      image: ubuntu-2004:202111-02
     environment:
       - CONFIG: "linux_64_c_compiler_version11cxx_compiler_version11linux_clang_version13"
       - UPLOAD_PACKAGES: "False"

diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
@@ -76,9 +76,7 @@ fi
 
 export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}"
 export IS_PR_BUILD="${IS_PR_BUILD:-False}"
-if [[ "$CI" != circle ]]; then
-    docker pull "${DOCKER_IMAGE}"
-fi
+docker pull "${DOCKER_IMAGE}"
 docker run ${DOCKER_RUN_ARGS} \
            -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \
            -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \