Skip to content

Commit f777b6a

Browse files
Bot Updating Templated Files
1 parent 558916d commit f777b6a

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
@@ -49,11 +49,21 @@ pipeline {
4949
steps{
5050
echo "Running on node: ${NODE_NAME}"
5151
sh '''#! /bin/bash
52-
containers=$(docker ps -aq)
52+
echo "Pruning builder"
53+
docker builder prune -f --builder container || :
54+
containers=$(docker ps -q)
5355
if [[ -n "${containers}" ]]; then
54-
docker stop ${containers}
56+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
57+
for container in ${containers}; do
58+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
59+
echo "skipping buildx container in docker stop"
60+
else
61+
echo "Stopping container ${container}"
62+
docker stop ${container}
63+
fi
64+
done
5565
fi
56-
docker system prune -af --volumes || : '''
66+
docker system prune -f --volumes || : '''
5767
script{
5868
env.EXIT_STATUS = ''
5969
env.LS_RELEASE = sh(
@@ -1081,12 +1091,21 @@ EOF
10811091
}
10821092
cleanup {
10831093
sh '''#! /bin/bash
1084-
echo "Performing docker system prune!!"
1085-
containers=$(docker ps -aq)
1094+
echo "Pruning builder!!"
1095+
docker builder prune -f --builder container || :
1096+
containers=$(docker ps -q)
10861097
if [[ -n "${containers}" ]]; then
1087-
docker stop ${containers}
1098+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1099+
for container in ${containers}; do
1100+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1101+
echo "skipping buildx container in docker stop"
1102+
else
1103+
echo "Stopping container ${container}"
1104+
docker stop ${container}
1105+
fi
1106+
done
10881107
fi
1089-
docker system prune -af --volumes || :
1108+
docker system prune -f --volumes || :
10901109
'''
10911110
cleanWs()
10921111
}

0 commit comments

Comments
 (0)