Skip to content

Commit 32e98d8

Browse files
committed
Merge branch 'master' into monthly
2 parents 3a2ab13 + c8c92af commit 32e98d8

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

Jenkinsfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ pipeline {
7070
fi
7171
done
7272
fi
73-
docker system prune -f --volumes || : '''
73+
docker system prune -f --volumes || :
74+
docker image prune -af || :
75+
'''
7476
script{
7577
env.EXIT_STATUS = ''
7678
env.LS_RELEASE = sh(
@@ -705,7 +707,8 @@ pipeline {
705707
if [[ -n "${containers}" ]]; then
706708
docker stop ${containers}
707709
fi
708-
docker system prune -af --volumes || :
710+
docker system prune -f --volumes || :
711+
docker image prune -af || :
709712
'''
710713
}
711714
}
@@ -1131,6 +1134,7 @@ EOF
11311134
done
11321135
fi
11331136
docker system prune -f --volumes || :
1137+
docker image prune -af || :
11341138
'''
11351139
cleanWs()
11361140
}

package_versions.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ coreutils-env 9.5-r2 apk
2424
coreutils-fmt 9.5-r2 apk
2525
coreutils-sha512sum 9.5-r2 apk
2626
cryptography 42.0.7 python
27-
curl 8.11.1-r0 apk
27+
curl 8.12.0-r0 apk
2828
findutils 4.9.0-r5 apk
2929
gdbm 1.23-r1 apk
3030
github.com/a8m/envsubst v1.4.2 go-module
@@ -56,8 +56,8 @@ libacl 2.3.2-r0 apk
5656
libattr 2.5.2-r0 apk
5757
libbsd 0.12.2-r0 apk
5858
libbz2 1.0.8-r6 apk
59-
libcrypto3 3.3.2-r1 apk
60-
libcurl 8.11.1-r0 apk
59+
libcrypto3 3.3.2-r2 apk
60+
libcurl 8.12.0-r0 apk
6161
libexpat 2.6.4-r0 apk
6262
libffi 3.4.6-r0 apk
6363
libgcc 13.2.1_git20240309-r0 apk
@@ -68,7 +68,7 @@ libncursesw 6.4_p20240420-r2 apk
6868
libpanelw 6.4_p20240420-r2 apk
6969
libproc2 4.0.4-r0 apk
7070
libpsl 0.21.5-r1 apk
71-
libssl3 3.3.2-r1 apk
71+
libssl3 3.3.2-r2 apk
7272
libstdc++ 13.2.1_git20240309-r0 apk
7373
libunistring 1.2-r0 apk
7474
linux-pam 1.6.0-r0 apk
@@ -107,13 +107,13 @@ py3-resolvelib 1.0.1-r1 apk
107107
py3-resolvelib-pyc 1.0.1-r1 apk
108108
py3-yaml 6.0.1-r3 apk
109109
py3-yaml-pyc 6.0.1-r3 apk
110-
pyc 3.12.8-r1 apk
110+
pyc 3.12.9-r0 apk
111111
pycparser 2.22 python
112112
pynacl 1.5.0 python
113113
pyparsing 3.1.2 python
114-
python3 3.12.8-r1 apk
115-
python3-pyc 3.12.8-r1 apk
116-
python3-pycache-pyc0 3.12.8-r1 apk
114+
python3 3.12.9-r0 apk
115+
python3-pyc 3.12.9-r0 apk
116+
python3-pycache-pyc0 3.12.9-r0 apk
117117
pyyaml 6.0.1 python
118118
readline 8.2.10-r0 apk
119119
resolvelib 1.0.1 python

0 commit comments

Comments
 (0)