File tree Expand file tree Collapse file tree 1 file changed +5
-8
lines changed Expand file tree Collapse file tree 1 file changed +5
-8
lines changed Original file line number Diff line number Diff line change @@ -140,6 +140,7 @@ jobs:
140
140
- checkout
141
141
- run :
142
142
name : install docker
143
+ <<<<<<< HEAD
143
144
command : |
144
145
apt-get update -q
145
146
apt-get install -q -y ca-certificates curl gnupg lsb-release
@@ -148,6 +149,9 @@ jobs:
148
149
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
149
150
apt-get update -q
150
151
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)
151
155
- setup_remote_docker
152
156
# Build and test the tip-of-tree build of EMSDK
153
157
- run :
@@ -163,14 +167,7 @@ jobs:
163
167
- checkout
164
168
- run :
165
169
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
174
171
- setup_remote_docker
175
172
- run :
176
173
name : build
You can’t perform that action at this time.
0 commit comments