Skip to content

Commit 0d7d99c

Browse files
Bot Updating Templated Files
1 parent 460a5ff commit 0d7d99c

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
@@ -60,11 +60,21 @@ pipeline {
6060
steps{
6161
echo "Running on node: ${NODE_NAME}"
6262
sh '''#! /bin/bash
63-
containers=$(docker ps -aq)
63+
echo "Pruning builder"
64+
docker builder prune -f --builder container || :
65+
containers=$(docker ps -q)
6466
if [[ -n "${containers}" ]]; then
65-
docker stop ${containers}
67+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
68+
for container in ${containers}; do
69+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
70+
echo "skipping buildx container in docker stop"
71+
else
72+
echo "Stopping container ${container}"
73+
docker stop ${container}
74+
fi
75+
done
6676
fi
67-
docker system prune -af --volumes || : '''
77+
docker system prune -f --volumes || : '''
6878
script{
6979
env.EXIT_STATUS = ''
7080
env.LS_RELEASE = sh(
@@ -1163,12 +1173,21 @@ EOF
11631173
}
11641174
cleanup {
11651175
sh '''#! /bin/bash
1166-
echo "Performing docker system prune!!"
1167-
containers=$(docker ps -aq)
1176+
echo "Pruning builder!!"
1177+
docker builder prune -f --builder container || :
1178+
containers=$(docker ps -q)
11681179
if [[ -n "${containers}" ]]; then
1169-
docker stop ${containers}
1180+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1181+
for container in ${containers}; do
1182+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1183+
echo "skipping buildx container in docker stop"
1184+
else
1185+
echo "Stopping container ${container}"
1186+
docker stop ${container}
1187+
fi
1188+
done
11701189
fi
1171-
docker system prune -af --volumes || :
1190+
docker system prune -f --volumes || :
11721191
'''
11731192
cleanWs()
11741193
}

0 commit comments

Comments
 (0)