Skip to content

Commit

Permalink
Merge pull request containerd#4697 from estesp/cp-4692-1.3
Browse files Browse the repository at this point in the history
[release/1.3] backport: Remove setuid gosu in favor of "sudo -E PATH=$PATH ..."
  • Loading branch information
fuweid committed Nov 7, 2020
2 parents ee26aa8 + d1f19be commit 81678f0
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -266,16 +266,6 @@ jobs:
with:
go-version: '1.13.15'

- name: Setup gosu
shell: bash
run: |
GOSU=/usr/local/bin/gosu
arch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"
sudo wget -O ${GOSU} "https://github.com/tianon/gosu/releases/download/1.12/gosu-$arch"
sudo chmod +x ${GOSU}
sudo chown root ${GOSU}
sudo chmod +s ${GOSU}
- name: Set env
shell: bash
run: |
Expand All @@ -289,10 +279,10 @@ jobs:

- name: Install containerd dependencies
run: |
sudo PATH=$PATH script/setup/install-seccomp
gosu root script/setup/install-runc
script/setup/install-cni
script/setup/install-critools
sudo -E PATH=$PATH script/setup/install-seccomp
sudo -E PATH=$PATH script/setup/install-runc
sudo -E PATH=$PATH script/setup/install-cni
sudo -E PATH=$PATH script/setup/install-critools
working-directory: src/github.com/containerd/containerd

- name: Install criu
Expand Down

0 comments on commit 81678f0

Please sign in to comment.