Skip to content

Commit 7005588

Browse files
committed
Revert "Switch to the new docker installation"
This reverts commit eb70195.
1 parent 29f8cbe commit 7005588

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

.circleci/config.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ jobs:
140140
- checkout
141141
- run:
142142
name: install docker
143+
<<<<<<< HEAD
143144
command: |
144145
apt-get update -q
145146
apt-get install -q -y ca-certificates curl gnupg lsb-release
@@ -148,6 +149,9 @@ jobs:
148149
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
149150
apt-get update -q
150151
apt-get install -q -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
152+
=======
153+
command: apt-get update -q && apt-get install -q -y docker.io
154+
>>>>>>> parent of eb70195 (Switch to the new docker installation)
151155
- setup_remote_docker
152156
# Build and test the tip-of-tree build of EMSDK
153157
- run:
@@ -163,14 +167,7 @@ jobs:
163167
- checkout
164168
- run:
165169
name: install docker
166-
command: |
167-
apt-get update -q
168-
apt-get install -q -y ca-certificates curl gnupg lsb-release
169-
mkdir -p /etc/apt/keyrings
170-
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
171-
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
172-
apt-get update -q
173-
apt-get install -q -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
170+
command: apt-get update -q && apt-get install -q -y docker.io
174171
- setup_remote_docker
175172
- run:
176173
name: build

0 commit comments

Comments
 (0)