Skip to content

Commit f6ea2c9

Browse files
Bot Updating Templated Files
1 parent 22e7573 commit f6ea2c9

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
@@ -58,11 +58,21 @@ pipeline {
5858
steps{
5959
echo "Running on node: ${NODE_NAME}"
6060
sh '''#! /bin/bash
61-
containers=$(docker ps -aq)
61+
echo "Pruning builder"
62+
docker builder prune -f --builder container || :
63+
containers=$(docker ps -q)
6264
if [[ -n "${containers}" ]]; then
63-
docker stop ${containers}
65+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
66+
for container in ${containers}; do
67+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
68+
echo "skipping buildx container in docker stop"
69+
else
70+
echo "Stopping container ${container}"
71+
docker stop ${container}
72+
fi
73+
done
6474
fi
65-
docker system prune -af --volumes || : '''
75+
docker system prune -f --volumes || : '''
6676
script{
6777
env.EXIT_STATUS = ''
6878
env.LS_RELEASE = sh(
@@ -1161,12 +1171,21 @@ EOF
11611171
}
11621172
cleanup {
11631173
sh '''#! /bin/bash
1164-
echo "Performing docker system prune!!"
1165-
containers=$(docker ps -aq)
1174+
echo "Pruning builder!!"
1175+
docker builder prune -f --builder container || :
1176+
containers=$(docker ps -q)
11661177
if [[ -n "${containers}" ]]; then
1167-
docker stop ${containers}
1178+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1179+
for container in ${containers}; do
1180+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1181+
echo "skipping buildx container in docker stop"
1182+
else
1183+
echo "Stopping container ${container}"
1184+
docker stop ${container}
1185+
fi
1186+
done
11681187
fi
1169-
docker system prune -af --volumes || :
1188+
docker system prune -f --volumes || :
11701189
'''
11711190
cleanWs()
11721191
}

0 commit comments

Comments
 (0)