Skip to content

Commit 01efa3b

Browse files
Bot Updating Templated Files
1 parent dbac943 commit 01efa3b

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
@@ -56,11 +56,21 @@ pipeline {
5656
steps{
5757
echo "Running on node: ${NODE_NAME}"
5858
sh '''#! /bin/bash
59-
containers=$(docker ps -aq)
59+
echo "Pruning builder"
60+
docker builder prune -f --builder container || :
61+
containers=$(docker ps -q)
6062
if [[ -n "${containers}" ]]; then
61-
docker stop ${containers}
63+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
64+
for container in ${containers}; do
65+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
66+
echo "skipping buildx container in docker stop"
67+
else
68+
echo "Stopping container ${container}"
69+
docker stop ${container}
70+
fi
71+
done
6272
fi
63-
docker system prune -af --volumes || : '''
73+
docker system prune -f --volumes || : '''
6474
script{
6575
env.EXIT_STATUS = ''
6676
env.LS_RELEASE = sh(
@@ -1009,12 +1019,21 @@ EOF
10091019
}
10101020
cleanup {
10111021
sh '''#! /bin/bash
1012-
echo "Performing docker system prune!!"
1013-
containers=$(docker ps -aq)
1022+
echo "Pruning builder!!"
1023+
docker builder prune -f --builder container || :
1024+
containers=$(docker ps -q)
10141025
if [[ -n "${containers}" ]]; then
1015-
docker stop ${containers}
1026+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1027+
for container in ${containers}; do
1028+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1029+
echo "skipping buildx container in docker stop"
1030+
else
1031+
echo "Stopping container ${container}"
1032+
docker stop ${container}
1033+
fi
1034+
done
10161035
fi
1017-
docker system prune -af --volumes || :
1036+
docker system prune -f --volumes || :
10181037
'''
10191038
cleanWs()
10201039
}

0 commit comments

Comments
 (0)