Revert "Switch to the new docker installation"

This reverts commit eb70195.
emscripten-core · Feb 8, 2023 · 7005588 · 7005588
1 parent 29f8cbe
commit 7005588
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -140,6 +140,7 @@ jobs:
       - checkout
       - run:
           name: install docker
+<<<<<<< HEAD
           command: |
             apt-get update -q 
             apt-get install -q -y ca-certificates curl gnupg lsb-release
@@ -148,6 +149,9 @@ jobs:
             echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
             apt-get update -q
             apt-get install -q -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+=======
+          command: apt-get update -q && apt-get install -q -y docker.io
+>>>>>>> parent of eb70195 (Switch to the new docker installation)
       - setup_remote_docker
       # Build and test the tip-of-tree build of EMSDK
       - run:
@@ -163,14 +167,7 @@ jobs:
       - checkout
       - run:
           name: install docker
-          command: |
-            apt-get update -q 
-            apt-get install -q -y ca-certificates curl gnupg lsb-release
-            mkdir -p /etc/apt/keyrings
-            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
-            apt-get update -q
-            apt-get install -q -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+          command: apt-get update -q && apt-get install -q -y docker.io
       - setup_remote_docker
       - run:
           name: build