Skip to content

Commit c23e96c

Browse files
Bot Updating Templated Files
1 parent bc040e1 commit c23e96c

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(
@@ -1150,12 +1160,21 @@ EOF
11501160
}
11511161
cleanup {
11521162
sh '''#! /bin/bash
1153-
echo "Performing docker system prune!!"
1154-
containers=$(docker ps -aq)
1163+
echo "Pruning builder!!"
1164+
docker builder prune -f --builder container || :
1165+
containers=$(docker ps -q)
11551166
if [[ -n "${containers}" ]]; then
1156-
docker stop ${containers}
1167+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1168+
for container in ${containers}; do
1169+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1170+
echo "skipping buildx container in docker stop"
1171+
else
1172+
echo "Stopping container ${container}"
1173+
docker stop ${container}
1174+
fi
1175+
done
11571176
fi
1158-
docker system prune -af --volumes || :
1177+
docker system prune -f --volumes || :
11591178
'''
11601179
cleanWs()
11611180
}

0 commit comments

Comments
 (0)