Skip to content

Commit 81678f0

Browse files
authored
Merge pull request containerd#4697 from estesp/cp-4692-1.3
[release/1.3] backport: Remove setuid gosu in favor of "sudo -E PATH=$PATH ..."
2 parents ee26aa8 + d1f19be commit 81678f0

File tree

1 file changed

+4
-14
lines changed

1 file changed

+4
-14
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -266,16 +266,6 @@ jobs:
266266
with:
267267
go-version: '1.13.15'
268268

269-
- name: Setup gosu
270-
shell: bash
271-
run: |
272-
GOSU=/usr/local/bin/gosu
273-
arch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"
274-
sudo wget -O ${GOSU} "https://github.com/tianon/gosu/releases/download/1.12/gosu-$arch"
275-
sudo chmod +x ${GOSU}
276-
sudo chown root ${GOSU}
277-
sudo chmod +s ${GOSU}
278-
279269
- name: Set env
280270
shell: bash
281271
run: |
@@ -289,10 +279,10 @@ jobs:
289279

290280
- name: Install containerd dependencies
291281
run: |
292-
sudo PATH=$PATH script/setup/install-seccomp
293-
gosu root script/setup/install-runc
294-
script/setup/install-cni
295-
script/setup/install-critools
282+
sudo -E PATH=$PATH script/setup/install-seccomp
283+
sudo -E PATH=$PATH script/setup/install-runc
284+
sudo -E PATH=$PATH script/setup/install-cni
285+
sudo -E PATH=$PATH script/setup/install-critools
296286
working-directory: src/github.com/containerd/containerd
297287

298288
- name: Install criu

0 commit comments

Comments
 (0)