Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set docker daemon log-level to warn by default #98

Merged
merged 1 commit into from
Mar 3, 2024
Merged

Set docker daemon log-level to warn by default #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions rootfs/etc/docker/daemon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
"data-root": "/home/jenkins/agent/docker",
"features": {
"buildkit": true
},
"mtu": 1400
"data-root": "/home/jenkins/agent/docker",
"log-level": "warn"
}
1 change: 0 additions & 1 deletion rootfs/etc/fix-attrs.d/jenkins-workspace
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion rootfs/etc/optional-services.d/sshd/check_readiness.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

exec ssh -q -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null jenkins@127.0.0.1 true &>/dev/null
exec ssh -q -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "${NON_ROOT_USER?}@127.0.0.1" true &>/dev/null
4 changes: 2 additions & 2 deletions scripts/prepare_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ sudo -u "${NON_ROOT_USER}" true

# ensure jenkins-agent directory exists
mkdir -p "${AGENT_WORKDIR}"
# and is owned by the jenkins user
chown -R "${NON_ROOT_USER}:${NON_ROOT_USER}" "${AGENT_WORKDIR}"
chmod 755 "${AGENT_WORKDIR}"

## apt repositories
${APT_GET_INSTALL} \
Expand Down Expand Up @@ -143,7 +143,7 @@ chmod +x /usr/local/bin/dind
docker_agent_version=$(basename "$(${CURL} -o /dev/null -w "%{url_effective}" https://github.com/jenkinsci/docker-agent/releases/latest)")
version=$(echo "${docker_agent_version}" | cut -d'-' -f1)
mkdir -p /usr/share/jenkins
chmod 0755 /usr/share/jenkins
chmod 755 /usr/share/jenkins
${CURL} -o /usr/share/jenkins/agent.jar "https://repo.jenkins-ci.org/public/org/jenkins-ci/main/remoting/${version}/remoting-${version}.jar"
chmod +x /usr/share/jenkins/agent.jar
ln -sf /usr/share/jenkins/agent.jar /usr/share/jenkins/slave.jar
Expand Down