Skip to content

Commit 994d81a

Browse files
Bot Updating Templated Files
1 parent 87548e5 commit 994d81a

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(
@@ -1086,12 +1096,21 @@ EOF
10861096
}
10871097
cleanup {
10881098
sh '''#! /bin/bash
1089-
echo "Performing docker system prune!!"
1090-
containers=$(docker ps -aq)
1099+
echo "Pruning builder!!"
1100+
docker builder prune -f --builder container || :
1101+
containers=$(docker ps -q)
10911102
if [[ -n "${containers}" ]]; then
1092-
docker stop ${containers}
1103+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1104+
for container in ${containers}; do
1105+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1106+
echo "skipping buildx container in docker stop"
1107+
else
1108+
echo "Stopping container ${container}"
1109+
docker stop ${container}
1110+
fi
1111+
done
10931112
fi
1094-
docker system prune -af --volumes || :
1113+
docker system prune -f --volumes || :
10951114
'''
10961115
cleanWs()
10971116
}

0 commit comments

Comments
 (0)