github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #4718 from thaJeztah/remove_sudo_remnants

Browse Source 
install-runc: remove unused USESUDO variable
This commit is contained in:
Michael Crosby 2020-11-10 10:18:13 -05:00 committed by GitHub
commit 677aaad83c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -280,7 +280,7 @@ install-cri-deps: $(BINARIES)
@install -m 644 containerd.service ${CRIDIR}/etc/systemd/system @install -m 644 containerd.service ${CRIDIR}/etc/systemd/system
echo "CONTAINERD_VERSION: '$(VERSION:v%=%)'" | tee ${CRIDIR}/opt/containerd/cluster/version echo "CONTAINERD_VERSION: '$(VERSION:v%=%)'" | tee ${CRIDIR}/opt/containerd/cluster/version
DESTDIR=$(CRIDIR) USESUDO=false script/setup/install-runc DESTDIR=$(CRIDIR) script/setup/install-runc
DESTDIR=$(CRIDIR) script/setup/install-cni DESTDIR=$(CRIDIR) script/setup/install-cni
DESTDIR=$(CRIDIR) script/setup/install-critools DESTDIR=$(CRIDIR) script/setup/install-critools

9
script/setup/install-runc
View File

@ -27,14 +27,7 @@ function install_runc() {
cd "$GOPATH"/src/github.com/opencontainers/runc cd "$GOPATH"/src/github.com/opencontainers/runc
git checkout $RUNC_COMMIT git checkout $RUNC_COMMIT
make BUILDTAGS='apparmor seccomp selinux' runc make BUILDTAGS='apparmor seccomp selinux' runc
make install
USESUDO=${USESUDO:-false}
if ${USESUDO}; then
SUDO='sudo -E'
else
SUDO=''
fi
${SUDO} make install
} }
function install_crun() { function install_crun() {