actions/actions-runner-controller
1
0
Fork 0
mirror of https://github.com/actions/actions-runner-controller.git synced 2025-12-15 06:26:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

runner: Expose dind runner dockerd logs via stdout/stderr (#2082)

Browse Source 
* runner: Expose dind runner dockerd logs via stdout/stderr

We've been letting supervisord to run dockerd within the dind runner container presuming it would avoid producing zombie processes. However we used dumb-init to wrap supervisord to wrap dockerd. In this picture supervisord might be unnecessary and dumb-init is actually a correct pid 0 for containers.

Rmoving supervisord removes this unnecessary complexity, while saving a little memory, and more importantly logs from dockerd is exposed via stdout/stderr of the container for easy access from kubectl-logs, fluentd, and so on.
This commit is contained in:
Yusuke Kuoka
2022-12-12 08:39:35 +09:00
committed by GitHub
parent 418f719bdf
commit acbce4b70a
6 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
runner/entrypoint-dind.sh
View File

@@ -13,7 +13,7 @@ fi
if [ -n "${MTU}" ]; then
jq ".\"mtu\" = ${MTU}" /etc/docker/daemon.json > /tmp/.daemon.json && mv /tmp/.daemon.json /etc/docker/daemon.json
# See https://docs.docker.com/engine/security/rootless/
echo "environment=DOCKERD_ROOTLESS_ROOTLESSKIT_MTU=${MTU}" >> /etc/supervisor/conf.d/dockerd.conf
export DOCKERD_ROOTLESS_ROOTLESSKIT_MTU=${MTU}
fi
if [ -n "${DOCKER_DEFAULT_ADDRESS_POOL_BASE}" ] && [ -n "${DOCKER_DEFAULT_ADDRESS_POOL_SIZE}" ]; then
@@ -37,12 +37,12 @@ dump() {
printf -- '---\n' 1>&2
}
for config in /etc/docker/daemon.json /etc/supervisor/conf.d/dockerd.conf; do
for config in /etc/docker/daemon.json; do
dump "$config" 'Using {path} with the following content:'
done
log.debug 'Starting supervisor daemon'
sudo /usr/bin/supervisord -n >> /dev/null 2>&1 &
log.debug 'Starting Docker daemon'
sudo /usr/bin/dockerd &
log.debug 'Waiting for processes to be running...'
processes=(dockerd)
@@ -50,8 +50,6 @@ processes=(dockerd)
for process in "${processes[@]}"; do
if ! wait_for_process "$process"; then
log.error "$process is not running after max time"
dump /var/log/dockerd.err.log 'Dumping {path} to aid investigation'
dump /var/log/supervisor/supervisord.log 'Dumping {path} to aid investigation'
exit 1
else
log.debug "$process is running"