Skip to content

Commit

Permalink
fix: Reap orphaned ("zombie") processes in argocd-repo-server pod (ar…
Browse files Browse the repository at this point in the history
…goproj#3611) (argoproj#3721)

* fix: Reap orphaned ("zombie") processes in argocd-repo-server pod
  • Loading branch information
jannfis authored Jun 9, 2020
1 parent b6e2d5a commit 4032e8e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RUN groupadd -g 999 argocd && \
chmod g=u /home/argocd && \
chmod g=u /etc/passwd && \
apt-get update && \
apt-get install -y git git-lfs python3-pip && \
apt-get install -y git git-lfs python3-pip tini && \
apt-get clean && \
pip3 install awscli==1.17.7 && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
Expand Down
8 changes: 7 additions & 1 deletion uid_entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,10 @@ if ! whoami &> /dev/null; then
fi
fi

exec "$@"
# If we're started as PID 1, we should wrap command execution through tini to
# prevent leakage of orphaned processes ("zombies").
if test "$$" = "1"; then
exec tini -- $@
else
exec "$@"
fi

0 comments on commit 4032e8e

Please sign in to comment.