.github/workflows, images/ubuntu: Add p11-kit-client.so to newer Ubuntus
A subsequent commit will use this to give Toolbx containers access to
the certificates from certificate authorities on the host. This commit
was kept separate from the changes to toolbox(1) to ensure that the
ubuntu-toolbox images are ready before that happens.
Unfortunately, Ubuntu 16.04 Xenial Xerus has p11-kit 0.23.2 [1], while
p11-kit-client.so was introduced in p11-kit 0.23.10 [2]. Therefore,
this feature will be disabled for Ubuntu 16.04.
This reverts parts of commit 1e9308625a to
re-enable building the ubuntu-toolbox:18.04 image.
[1] https://code.launchpad.net/~git-ubuntu-import/ubuntu/+source/p11-kit/+git/p11-kit/+ref/ubuntu/xenial-updates
[2] p11-kit commit 0684cd7b7f815b41
https://github.com/p11-glue/p11-kit/commit/0684cd7b7f815b41
https://github.com/p11-glue/p11-kit/pull/15
https://github.com/containers/toolbox/issues/626
This commit is contained in:
parent
02fe08f70e
commit
aa8507730d
|
|
@ -36,7 +36,7 @@ jobs:
|
|||
build-push-images:
|
||||
strategy:
|
||||
matrix:
|
||||
release: ['20.04', '22.04', '24.04', '24.10']
|
||||
release: ['18.04', '20.04', '22.04', '24.04', '24.10']
|
||||
fail-fast: false
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ curl
|
|||
git
|
||||
gnupg2
|
||||
keyutils
|
||||
p11-kit-modules
|
||||
tree
|
||||
unzip
|
||||
zip
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ curl
|
|||
git
|
||||
gnupg2
|
||||
keyutils
|
||||
p11-kit-modules
|
||||
tree
|
||||
unzip
|
||||
zip
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ curl
|
|||
git
|
||||
gnupg2
|
||||
keyutils
|
||||
p11-kit-modules
|
||||
tree
|
||||
unzip
|
||||
zip
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ curl
|
|||
git
|
||||
gnupg2
|
||||
keyutils
|
||||
p11-kit-modules
|
||||
tree
|
||||
unzip
|
||||
zip
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ curl
|
|||
git
|
||||
gnupg2
|
||||
keyutils
|
||||
p11-kit-modules
|
||||
tree
|
||||
unzip
|
||||
zip
|
||||
|
|
|
|||
Loading…
Reference in New Issue