Merge pull request #4692 from tianon/nosu

Remove setuid gosu in favor of "sudo -E PATH=$PATH ..."
This commit is contained in:
Phil Estes 2020-11-05 19:47:55 -05:00 committed by GitHub
commit ac61e58cdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -238,15 +238,6 @@ jobs:
with:
go-version: '1.15.2'
- name: Setup gosu
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}
- uses: actions/checkout@v2
with:
path: src/github.com/containerd/containerd
@ -260,10 +251,10 @@ jobs:
env:
RUNC_FLAVOR: ${{ matrix.runc }}
run: |
sudo PATH=$PATH script/setup/install-seccomp
gosu root script/setup/install-runc
gosu root script/setup/install-cni
gosu root 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