From 0e6e6b5367cd9af354dd0ed7028e25d1220bb831 Mon Sep 17 00:00:00 2001 From: Kristian Klausen <kristian@klausen.dk> Date: Sat, 25 Nov 2023 15:41:30 +0100 Subject: [PATCH] gitlab_runner: Update for changed volume pruning behavior in Docker 23.0 "docker system prune --volumes" does no longer prune named volumes in Docker 23.0[1][2], so use "docker volume prune --all"[3] for pruning named volumes. [1] https://github.com/docker/cli/issues/4028 [2] https://github.com/moby/moby/pull/44259 [3] https://github.com/docker/cli/pull/4229 --- roles/gitlab_runner/files/gitlab-runner-docker-cleanup.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/gitlab_runner/files/gitlab-runner-docker-cleanup.service b/roles/gitlab_runner/files/gitlab-runner-docker-cleanup.service index 2c49032f6..9c8af73bb 100644 --- a/roles/gitlab_runner/files/gitlab-runner-docker-cleanup.service +++ b/roles/gitlab_runner/files/gitlab-runner-docker-cleanup.service @@ -3,5 +3,6 @@ Description=Cleanup containers, images and volumes produced by GitLab Runner [Service] Type=oneshot -ExecStart=docker system prune --force --filter label=com.gitlab.gitlab-runner.managed=true --volumes +ExecStart=docker system prune --force --filter label=com.gitlab.gitlab-runner.managed=true +ExecStart=docker volume prune --all --force --filter label=com.gitlab.gitlab-runner.managed=true ExecStart=docker image prune --all --force --filter until=168h -- GitLab