Skip to content

Commit 2cc0a30

Browse files
Bot Updating Templated Files
1 parent c35d34f commit 2cc0a30

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
@@ -58,11 +58,21 @@ pipeline {
5858
steps{
5959
echo "Running on node: ${NODE_NAME}"
6060
sh '''#! /bin/bash
61-
containers=$(docker ps -aq)
61+
echo "Pruning builder"
62+
docker builder prune -f --builder container || :
63+
containers=$(docker ps -q)
6264
if [[ -n "${containers}" ]]; then
63-
docker stop ${containers}
65+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
66+
for container in ${containers}; do
67+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
68+
echo "skipping buildx container in docker stop"
69+
else
70+
echo "Stopping container ${container}"
71+
docker stop ${container}
72+
fi
73+
done
6474
fi
65-
docker system prune -af --volumes || : '''
75+
docker system prune -f --volumes || : '''
6676
script{
6777
env.EXIT_STATUS = ''
6878
env.LS_RELEASE = sh(
@@ -1153,12 +1163,21 @@ EOF
11531163
}
11541164
cleanup {
11551165
sh '''#! /bin/bash
1156-
echo "Performing docker system prune!!"
1157-
containers=$(docker ps -aq)
1166+
echo "Pruning builder!!"
1167+
docker builder prune -f --builder container || :
1168+
containers=$(docker ps -q)
11581169
if [[ -n "${containers}" ]]; then
1159-
docker stop ${containers}
1170+
BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
1171+
for container in ${containers}; do
1172+
if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
1173+
echo "skipping buildx container in docker stop"
1174+
else
1175+
echo "Stopping container ${container}"
1176+
docker stop ${container}
1177+
fi
1178+
done
11601179
fi
1161-
docker system prune -af --volumes || :
1180+
docker system prune -f --volumes || :
11621181
'''
11631182
cleanWs()
11641183
}

0 commit comments

Comments
 (0)