Skip to content

Commit 8308f57

Browse files
Bot Updating Templated Files
1 parent 9db6d6e commit 8308f57

1 file changed

Lines changed: 26 additions & 7 deletions

File tree

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(
@@ -1089,12 +1099,21 @@ EOF
10891099
}
10901100
cleanup {
10911101
sh '''#! /bin/bash
1092-
echo "Performing docker system prune!!"
1093-
containers=$(docker ps -aq)
1102+
echo "Pruning builder!!"
1103+
docker builder prune -f --builder container || :
1104+
containers=$(docker ps -q)
10941105
if [[ -n "${containers}" ]]; then
1095-
docker stop ${containers}
1106+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1107+
for container in ${containers}; do
1108+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1109+
echo "skipping buildx container in docker stop"
1110+
else
1111+
echo "Stopping container ${container}"
1112+
docker stop ${container}
1113+
fi
1114+
done
10961115
fi
1097-
docker system prune -af --volumes || :
1116+
docker system prune -f --volumes || :
10981117
'''
10991118
cleanWs()
11001119
}

0 commit comments

Comments
 (0)