update test docker to devuan chimaera

install pinentry curses and gpg

update github action checkout v3
This commit is contained in:
Jaromil 2022-04-13 15:21:46 +02:00
parent b7822afaf0
commit 60034b0b55
7 changed files with 15 additions and 15 deletions

View File

@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Build the Docker image
run: |
cp -v extras/test/Dockerfile .
@ -18,4 +18,4 @@ jobs:
- name: Run main test suite
run: docker run -t --privileged dyne/tomb /bin/bash -c "make test"
- name: Run Tomb-kdb tests
run: docker run -t --privileged dyne/tomb /bin/bash -c "make -C extras/kdf-keys test"
run: docker run -t --privileged dyne/tomb /bin/bash -c "make -C extras/kdf-keys test"

View File

@ -4,7 +4,7 @@
# This creates an Ubuntu derived base image and installs the tomb libarary
# along with it's dependencies.
FROM dyne/devuan:beowulf
FROM dyne/devuan:chimaera
ARG DEBIAN_FRONTEND=noninteractive
ARG TOMB_VERSION=2.9
@ -19,7 +19,8 @@ RUN apt-get update -y && \
zsh \
gnupg \
cryptsetup \
pinentry-curses \
pinentry pinentry-curses \
file xxd \
steghide \
mlocate \
swish-e

View File

@ -11,7 +11,7 @@ test_expect_success 'Testing tomb creation: dig, forge and lock' '
tt_forge --tomb-pwd $DUMMYPASS &&
print $DUMMYPASS \
| gpg --batch --passphrase-fd 0 --no-tty --no-options -d $tomb_key \
| hexdump -C &&
| xxd &&
tt_lock --tomb-pwd $DUMMYPASS
'
@ -22,7 +22,7 @@ if test_have_prereq SPHINX ORACLE; then
tt_forge --tomb-pwd $DUMMYPASS --sphx-user $DUMMYUSER --sphx-host $DUMMYHOST &&
print $(echo $DUMMYPASS | sphinx get $DUMMYUSER $DUMMYHOST) \
| gpg --batch --passphrase-fd 0 --no-tty --no-options -d $tomb_key \
| hexdump -C &&
| xxd &&
tt_lock --tomb-pwd $DUMMYPASS --sphx-user $DUMMYUSER --sphx-host $DUMMYHOST
'
fi
@ -34,7 +34,7 @@ if test_have_prereq DOAS; then
tt_forge --sudo doas --tomb-pwd $DUMMYPASS &&
print $DUMMYPASS \
| gpg --batch --passphrase-fd 0 --no-tty --no-options -d $tomb_key \
| hexdump -C &&
| xxd &&
tt_lock --sudo doas --tomb-pwd $DUMMYPASS
'
fi

View File

@ -11,7 +11,7 @@ if test_have_prereq KDF; then
tt_forge --tomb-pwd $DUMMYPASS --kdf 1 &&
print $DUMMYPASS \
| gpg --batch --passphrase-fd 0 --no-tty --no-options -d $tomb_key \
| hexdump -C &&
| xxd &&
tt_lock --tomb-pwd $DUMMYPASS --kdf 1
'

View File

@ -14,7 +14,7 @@ test_expect_success 'Testing set key' '
--unsafe --tomb-pwd $DUMMYPASS &&
print $DUMMYPASS \
| gpg --batch --passphrase-fd 0 --no-tty --no-options -d $tomb_key_new \
| hexdump -C &&
| xxd &&
tt_close
'
@ -40,7 +40,7 @@ if test_have_prereq SPHINX ORACLE; then
--sphx-user $DUMMYUSER --sphx-host $DUMMYHOST &&
print $DUMMYPASS \
| gpg --batch --passphrase-fd 0 --no-tty --no-options -d $tomb_key_new \
| hexdump -C &&
| xxd &&
tt_close
'
fi

View File

@ -1,9 +1,8 @@
FROM dyne/devuan:beowulf
FROM dyne/devuan:chimaera
RUN echo "deb http://deb.devuan.org/merged chimaera main" >> /etc/apt/sources.list
RUN apt-get update -y -q --allow-releaseinfo-change
RUN apt-get install -y -q -t beowulf zsh cryptsetup gawk libgcrypt20-dev steghide qrencode python python2.7 python3-pip python3-dev libssl-dev make gcc g++ sudo gettext file bsdmainutils
RUN apt-get install -y -q -t chimaera libsodium23 libsodium-dev doas
RUN apt-get install -y -q zsh cryptsetup gpg gawk libgcrypt20-dev steghide qrencode python python2.7 python3-pip python3-dev libssl-dev make gcc sudo gettext bsdmainutils file pinentry-curses xxd libsodium23 libsodium-dev doas
RUN pip3 install setuptools wheel
COPY . /Tomb/

View File

@ -100,7 +100,7 @@ test-tomb-create() {
notice "Dump of clear key contents to examine them:"
print ${dummypass} \
| gpg --batch --passphrase-fd 0 --no-tty --no-options -d /tmp/test.tomb.key \
| hexdump -C
| xxd
echo --
}
@ -309,7 +309,7 @@ test-set-key() {
notice "Dump of clear key contents to examine them:"
print ${dummypass} \
| gpg --batch --passphrase-fd 0 --no-tty --no-options -d /tmp/test.tomb.new.key \
| hexdump -C
| xxd
echo --
mv /tmp/test.tomb.new.key /tmp/test.tomb.key
tt close test