diff --git a/test/Dockerfile b/test/Dockerfile index f113737f39d855c1a45b10d927cf20ac586c7d7f..9201352a5e49b356b8876803869aaa4127a202db 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -16,7 +16,7 @@ RUN pacman -Syu --noconfirm --needed \ git \ parallel \ coreutils \ - sequoia-sq + rsop RUN pacman-key --init && \ echo '%wheel ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/wheel && \ @@ -58,10 +58,10 @@ RUN pacman-key --init && \ USER tester -RUN sq key generate --userid "Bob Tester <tester@localhost>" --output /build/private.key && \ - sq cert export --keyring /build/private.key | sudo pacman-key -a - && \ +RUN rsop generate-key "Bob Tester <tester@localhost>" > /build/private.tsk && \ + rsop extract-cert < /build/private.tsk | sudo pacman-key -a - && \ sudo pacman-key --lsign-key tester@localhost && \ - gpg --import /build/private.key && \ + gpg --import /build/private.tsk && \ gpgconf --kill gpg-agent && \ gpgconf --kill keyboxd && \ mkdir -p \ diff --git a/test/lib/common.bash b/test/lib/common.bash index 8176eed779692e21eef6e6a89c9c5f31136fd968..b739e8c828c68c238d21b3ba6ef3ae2ebb784641 100644 --- a/test/lib/common.bash +++ b/test/lib/common.bash @@ -122,7 +122,7 @@ __buildPackage() { done for p in ${pkgfiles[@]}; do - sq sign --detached --binary --signer-file /build/private.key --output "${p}.sig" "${p}" + rsop sign --no-armor /build/private.tsk > "${p}.sig" < "${p}" if [[ -n ${BUILDDIR} ]]; then cp -Lv ${p}{,.sig} ${cache}/