File tree Expand file tree Collapse file tree 3 files changed +7
-7
lines changed
Expand file tree Collapse file tree 3 files changed +7
-7
lines changed Original file line number Diff line number Diff line change 11.test-deb :
2- image : ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bullseye -slim
2+ image : ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm -slim
33 variables :
44 PASSBOLT_FLAVOUR : " "
55 PACKAGE_MANAGER : " apt"
@@ -60,13 +60,13 @@ Debian 12 PRO:
6060
6161Raspbian CE :
6262 extends : .test-deb-ce
63- image : ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bullseye -slim
63+ image : ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm -slim
6464 before_script :
6565 - sed -i "s/ID=debian/ID=raspbian/" /etc/os-release
6666
6767Raspbian PRO :
6868 extends : .test-deb-pro
69- image : ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bullseye -slim
69+ image : ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/debian:bookworm -slim
7070 before_script :
7171 - sed -i "s/ID=debian/ID=raspbian/" /etc/os-release
7272
Original file line number Diff line number Diff line change 236236}
237237
238238pull_updated_pub_key () {
239- declare -a serverlist=(" keys.mailvelope.com " " keys. openpgp.org" " pgp.mit.edu " )
239+ declare -a serverlist=(" keys.openpgp.org" " keyserver.ubuntu.com " )
240240 for serverin in " ${serverlist[@]} "
241241 do
242242 if [ ! -d /root/.gnupg ]
@@ -246,7 +246,7 @@ pull_updated_pub_key() {
246246 # Handle gpg error in case of a server key failure
247247 # Without this check, and because we are using set -euo pipefail
248248 # The script fail in case of failure
249- if gpg --no-default-keyring --keyring ${PASSBOLT_KEYRING_FILE} --keyserver hkps:// " ${serverin }" --recv-keys ${PASSBOLT_FINGERPRINT }; then
249+ if curl -sS " https:// ${serverin} /pks/lookup?op=get&options=mr&search=0x ${PASSBOLT_FINGERPRINT }" | gpg --dearmor --yes --output ${PASSBOLT_KEYRING_FILE }; then
250250 break
251251 fi
252252 done
Original file line number Diff line number Diff line change 236236}
237237
238238pull_updated_pub_key () {
239- declare -a serverlist=(" keys.mailvelope.com " " keys. openpgp.org" " pgp.mit.edu " )
239+ declare -a serverlist=(" keys.openpgp.org" " keyserver.ubuntu.com " )
240240 for serverin in " ${serverlist[@]} "
241241 do
242242 if [ ! -d /root/.gnupg ]
@@ -246,7 +246,7 @@ pull_updated_pub_key() {
246246 # Handle gpg error in case of a server key failure
247247 # Without this check, and because we are using set -euo pipefail
248248 # The script fail in case of failure
249- if gpg --no-default-keyring --keyring ${PASSBOLT_KEYRING_FILE} --keyserver hkps:// " ${serverin }" --recv-keys ${PASSBOLT_FINGERPRINT }; then
249+ if curl -sS " https:// ${serverin} /pks/lookup?op=get&options=mr&search=0x ${PASSBOLT_FINGERPRINT }" | gpg --dearmor --yes --output ${PASSBOLT_KEYRING_FILE }; then
250250 break
251251 fi
252252 done
You can’t perform that action at this time.
0 commit comments