Skip to content

Commit ebadee2

Browse files
Bot Updating Templated Files
1 parent e65bea0 commit ebadee2

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
@@ -59,11 +59,21 @@ pipeline {
5959
steps{
6060
echo "Running on node: ${NODE_NAME}"
6161
sh '''#! /bin/bash
62-
containers=$(docker ps -aq)
62+
echo "Pruning builder"
63+
docker builder prune -f --builder container || :
64+
containers=$(docker ps -q)
6365
if [[ -n "${containers}" ]]; then
64-
docker stop ${containers}
66+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
67+
for container in ${containers}; do
68+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
69+
echo "skipping buildx container in docker stop"
70+
else
71+
echo "Stopping container ${container}"
72+
docker stop ${container}
73+
fi
74+
done
6575
fi
66-
docker system prune -af --volumes || : '''
76+
docker system prune -f --volumes || : '''
6777
script{
6878
env.EXIT_STATUS = ''
6979
env.LS_RELEASE = sh(
@@ -1099,12 +1109,21 @@ EOF
10991109
}
11001110
cleanup {
11011111
sh '''#! /bin/bash
1102-
echo "Performing docker system prune!!"
1103-
containers=$(docker ps -aq)
1112+
echo "Pruning builder!!"
1113+
docker builder prune -f --builder container || :
1114+
containers=$(docker ps -q)
11041115
if [[ -n "${containers}" ]]; then
1105-
docker stop ${containers}
1116+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1117+
for container in ${containers}; do
1118+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1119+
echo "skipping buildx container in docker stop"
1120+
else
1121+
echo "Stopping container ${container}"
1122+
docker stop ${container}
1123+
fi
1124+
done
11061125
fi
1107-
docker system prune -af --volumes || :
1126+
docker system prune -f --volumes || :
11081127
'''
11091128
cleanWs()
11101129
}

0 commit comments

Comments
 (0)