Skip to content

Commit 25faf24

Browse files
Bot Updating Templated Files
1 parent a27c1e5 commit 25faf24

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(
@@ -1106,12 +1116,21 @@ EOF
11061116
}
11071117
cleanup {
11081118
sh '''#! /bin/bash
1109-
echo "Performing docker system prune!!"
1110-
containers=$(docker ps -aq)
1119+
echo "Pruning builder!!"
1120+
docker builder prune -f --builder container || :
1121+
containers=$(docker ps -q)
11111122
if [[ -n "${containers}" ]]; then
1112-
docker stop ${containers}
1123+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1124+
for container in ${containers}; do
1125+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1126+
echo "skipping buildx container in docker stop"
1127+
else
1128+
echo "Stopping container ${container}"
1129+
docker stop ${container}
1130+
fi
1131+
done
11131132
fi
1114-
docker system prune -af --volumes || :
1133+
docker system prune -f --volumes || :
11151134
'''
11161135
cleanWs()
11171136
}

0 commit comments

Comments
 (0)