Skip to content

Commit 381ca92

Browse files
Bot Updating Templated Files
1 parent ebc3933 commit 381ca92

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(
@@ -1087,12 +1097,21 @@ EOF
10871097
}
10881098
cleanup {
10891099
sh '''#! /bin/bash
1090-
echo "Performing docker system prune!!"
1091-
containers=$(docker ps -aq)
1100+
echo "Pruning builder!!"
1101+
docker builder prune -f --builder container || :
1102+
containers=$(docker ps -q)
10921103
if [[ -n "${containers}" ]]; then
1093-
docker stop ${containers}
1104+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1105+
for container in ${containers}; do
1106+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1107+
echo "skipping buildx container in docker stop"
1108+
else
1109+
echo "Stopping container ${container}"
1110+
docker stop ${container}
1111+
fi
1112+
done
10941113
fi
1095-
docker system prune -af --volumes || :
1114+
docker system prune -f --volumes || :
10961115
'''
10971116
cleanWs()
10981117
}

0 commit comments

Comments
 (0)