Skip to content

Commit a591261

Browse files
committed
Prune but don't remove buildx container
1 parent c173943 commit a591261

1 file changed

Lines changed: 26 additions & 7 deletions

File tree

roles/generate-jenkins/templates/Jenkinsfile.j2

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,21 @@ pipeline {
4242
steps{
4343
echo "Running on node: ${NODE_NAME}"
4444
sh '''#! /bin/bash
45-
containers=$(docker ps -aq)
45+
echo "Pruning builder"
46+
docker builder prune -f --builder container || :
47+
containers=$(docker ps -q)
4648
if [[ -n "${containers}" ]]; then
47-
docker stop ${containers}
49+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
50+
for container in ${containers}; do
51+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
52+
echo "skipping buildx container in docker stop"
53+
else
54+
echo "Stopping container ${container}"
55+
docker stop ${container}
56+
fi
57+
done
4858
fi
49-
docker system prune -af --volumes || : '''
59+
docker system prune -f --volumes || : '''
5060
script{
5161
env.EXIT_STATUS = ''
5262
env.LS_RELEASE = sh(
@@ -1447,12 +1457,21 @@ EOF
14471457
}
14481458
cleanup {
14491459
sh '''#! /bin/bash
1450-
echo "Performing docker system prune!!"
1451-
containers=$(docker ps -aq)
1460+
echo "Pruning builder!!"
1461+
docker builder prune -f --builder container || :
1462+
containers=$(docker ps -q)
14521463
if [[ -n "${containers}" ]]; then
1453-
docker stop ${containers}
1464+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1465+
for container in ${containers}; do
1466+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1467+
echo "skipping buildx container in docker stop"
1468+
else
1469+
echo "Stopping container ${container}"
1470+
docker stop ${container}
1471+
fi
1472+
done
14541473
fi
1455-
docker system prune -af --volumes || :
1474+
docker system prune -f --volumes || :
14561475
'''
14571476
cleanWs()
14581477
}

0 commit comments

Comments
 (0)