admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Adjust container checks for GitHub Actions changes

Browse Source
This commit is contained in:
Bo Anderson 2020-07-15 18:59:43 +01:00
parent 474c1ab7f6
commit 681dafd028
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/brew.rb
View File

@ -127,7 +127,7 @@ begin
ENV.delete("HOMEBREW_HELP") if help_flag ENV.delete("HOMEBREW_HELP") if help_flag
tap_commands = [] tap_commands = []
cgroup = Utils.popen_read("cat", "/proc/1/cgroup") cgroup = Utils.popen_read("cat", "/proc/1/cgroup")
if !cgroup.include?("azpl_job") && !cgroup.include?("docker") if %w[azpl_job actions_job docker garden kubepods].none? { |container| cgroup.include?(container) }
brew_uid = HOMEBREW_BREW_FILE.stat.uid brew_uid = HOMEBREW_BREW_FILE.stat.uid
tap_commands += %W[/usr/bin/sudo -u ##{brew_uid}] if Process.uid.zero? && !brew_uid.zero? tap_commands += %W[/usr/bin/sudo -u ##{brew_uid}] if Process.uid.zero? && !brew_uid.zero?
end end

4
Library/Homebrew/brew.sh
View File

@ -433,8 +433,8 @@ fi
check-run-command-as-root() { check-run-command-as-root() {
[[ "$(id -u)" = 0 ]] || return [[ "$(id -u)" = 0 ]] || return
# Allow Azure Pipelines/Docker/Concourse/Kubernetes to do everything as root (as it's normal there) # Allow Azure Pipelines/GitHub Actions/Docker/Concourse/Kubernetes to do everything as root (as it's normal there)
[[ -f /proc/1/cgroup ]] && grep -E "azpl_job|docker|garden|kubepods" -q /proc/1/cgroup && return [[ -f /proc/1/cgroup ]] && grep -E "azpl_job|actions_job|docker|garden|kubepods" -q /proc/1/cgroup && return
# Homebrew Services may need `sudo` for system-wide daemons. # Homebrew Services may need `sudo` for system-wide daemons.
[[ "$HOMEBREW_COMMAND" = "services" ]] && return [[ "$HOMEBREW_COMMAND" = "services" ]] && return