Skip to content

Commit bce9c92

Browse files
Bot Updating Templated Files
1 parent 6905aec commit bce9c92

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
@@ -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(
@@ -1162,12 +1172,21 @@ EOF
11621172
}
11631173
cleanup {
11641174
sh '''#! /bin/bash
1165-
echo "Performing docker system prune!!"
1166-
containers=$(docker ps -aq)
1175+
echo "Pruning builder!!"
1176+
docker builder prune -f --builder container || :
1177+
containers=$(docker ps -q)
11671178
if [[ -n "${containers}" ]]; then
1168-
docker stop ${containers}
1179+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1180+
for container in ${containers}; do
1181+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1182+
echo "skipping buildx container in docker stop"
1183+
else
1184+
echo "Stopping container ${container}"
1185+
docker stop ${container}
1186+
fi
1187+
done
11691188
fi
1170-
docker system prune -af --volumes || :
1189+
docker system prune -f --volumes || :
11711190
'''
11721191
cleanWs()
11731192
}

0 commit comments

Comments
 (0)