Skip to content

Commit cdfdf46

Browse files
Bot Updating Templated Files
1 parent 52c57a5 commit cdfdf46

File tree

1 file changed

+26
-7
lines changed

1 file changed

+26
-7
lines changed

Jenkinsfile

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,21 @@ pipeline {
5959
steps{
6060
echo "Running on node: ${NODE_NAME}"
6161
sh '''#! /bin/bash
62-
containers=$(docker ps -aq)
62+
echo "Pruning builder"
63+
docker builder prune -f --builder container || :
64+
containers=$(docker ps -q)
6365
if [[ -n "${containers}" ]]; then
64-
docker stop ${containers}
66+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
67+
for container in ${containers}; do
68+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
69+
echo "skipping buildx container in docker stop"
70+
else
71+
echo "Stopping container ${container}"
72+
docker stop ${container}
73+
fi
74+
done
6575
fi
66-
docker system prune -af --volumes || : '''
76+
docker system prune -f --volumes || : '''
6777
script{
6878
env.EXIT_STATUS = ''
6979
env.LS_RELEASE = sh(
@@ -1155,12 +1165,21 @@ EOF
11551165
}
11561166
cleanup {
11571167
sh '''#! /bin/bash
1158-
echo "Performing docker system prune!!"
1159-
containers=$(docker ps -aq)
1168+
echo "Pruning builder!!"
1169+
docker builder prune -f --builder container || :
1170+
containers=$(docker ps -q)
11601171
if [[ -n "${containers}" ]]; then
1161-
docker stop ${containers}
1172+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1173+
for container in ${containers}; do
1174+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1175+
echo "skipping buildx container in docker stop"
1176+
else
1177+
echo "Stopping container ${container}"
1178+
docker stop ${container}
1179+
fi
1180+
done
11621181
fi
1163-
docker system prune -af --volumes || :
1182+
docker system prune -f --volumes || :
11641183
'''
11651184
cleanWs()
11661185
}

0 commit comments

Comments
 (0)