Skip to content

Commit 44267d4

Browse files
Bot Updating Templated Files
1 parent b1c9041 commit 44267d4

File tree

1 file changed

+26
-7
lines changed

1 file changed

+26
-7
lines changed

Jenkinsfile

+26-7
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,21 @@ pipeline {
5757
steps{
5858
echo "Running on node: ${NODE_NAME}"
5959
sh '''#! /bin/bash
60-
containers=$(docker ps -aq)
60+
echo "Pruning builder"
61+
docker builder prune -f --builder container || :
62+
containers=$(docker ps -q)
6163
if [[ -n "${containers}" ]]; then
62-
docker stop ${containers}
64+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
65+
for container in ${containers}; do
66+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
67+
echo "skipping buildx container in docker stop"
68+
else
69+
echo "Stopping container ${container}"
70+
docker stop ${container}
71+
fi
72+
done
6373
fi
64-
docker system prune -af --volumes || : '''
74+
docker system prune -f --volumes || : '''
6575
script{
6676
env.EXIT_STATUS = ''
6777
env.LS_RELEASE = sh(
@@ -1152,12 +1162,21 @@ EOF
11521162
}
11531163
cleanup {
11541164
sh '''#! /bin/bash
1155-
echo "Performing docker system prune!!"
1156-
containers=$(docker ps -aq)
1165+
echo "Pruning builder!!"
1166+
docker builder prune -f --builder container || :
1167+
containers=$(docker ps -q)
11571168
if [[ -n "${containers}" ]]; then
1158-
docker stop ${containers}
1169+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1170+
for container in ${containers}; do
1171+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1172+
echo "skipping buildx container in docker stop"
1173+
else
1174+
echo "Stopping container ${container}"
1175+
docker stop ${container}
1176+
fi
1177+
done
11591178
fi
1160-
docker system prune -af --volumes || :
1179+
docker system prune -f --volumes || :
11611180
'''
11621181
cleanWs()
11631182
}

0 commit comments

Comments
 (0)