Merge pull request #4692 from tianon/nosu
Remove setuid gosu in favor of "sudo -E PATH=$PATH ..."
This commit is contained in:
commit
ac61e58cdd
17
.github/workflows/ci.yml
vendored
17
.github/workflows/ci.yml
vendored
@ -238,15 +238,6 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
go-version: '1.15.2'
|
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
|
- uses: actions/checkout@v2
|
||||||
with:
|
with:
|
||||||
path: src/github.com/containerd/containerd
|
path: src/github.com/containerd/containerd
|
||||||
@ -260,10 +251,10 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
RUNC_FLAVOR: ${{ matrix.runc }}
|
RUNC_FLAVOR: ${{ matrix.runc }}
|
||||||
run: |
|
run: |
|
||||||
sudo PATH=$PATH script/setup/install-seccomp
|
sudo -E PATH=$PATH script/setup/install-seccomp
|
||||||
gosu root script/setup/install-runc
|
sudo -E PATH=$PATH script/setup/install-runc
|
||||||
gosu root script/setup/install-cni
|
sudo -E PATH=$PATH script/setup/install-cni
|
||||||
gosu root script/setup/install-critools
|
sudo -E PATH=$PATH script/setup/install-critools
|
||||||
working-directory: src/github.com/containerd/containerd
|
working-directory: src/github.com/containerd/containerd
|
||||||
|
|
||||||
- name: Install criu
|
- name: Install criu
|
||||||
|
Loading…
Reference in New Issue
Block a user