diff --git a/tests/integration/.env b/tests/integration/.env index 0f1cedc..05905b6 100644 --- a/tests/integration/.env +++ b/tests/integration/.env @@ -206,7 +206,7 @@ LNBITS_EXTENSIONS_DEFAULT_INSTALL="tpos" # to use CockroachDB, specify LNBITS_DATABASE_URL=cockroachdb://... # for both PostgreSQL and CockroachDB, you'll need to install # psycopg2 as an additional dependency -LNBITS_DATA_FOLDER="./data" +LNBITS_DATA_FOLDER="/data" # LNBITS_DATABASE_URL="postgres://user:password@host:port/databasename" # the service fee (in percent) diff --git a/tests/integration/data.zip b/tests/integration/data.zip index e89b53e..6f7c483 100644 Binary files a/tests/integration/data.zip and b/tests/integration/data.zip differ diff --git a/tests/integration/start.sh b/tests/integration/start.sh index dd68b60..bd510a5 100644 --- a/tests/integration/start.sh +++ b/tests/integration/start.sh @@ -1,5 +1,5 @@ #!/bin/bash - +set -e # cd in the script folder cd "$(dirname "$0")" @@ -27,18 +27,25 @@ ghcr.io/hoytech/strfry:latest # Start lnbits with the nwcprovider extension rm -Rf lnbits_itest_data unzip data.zip + docker run --name=lnbits_nwcprovider_ext_lnbits_test \ -d \ --rm \ +--user $(id -u):$(id -g) \ -p 5002:5000 \ -v ${PWD}/.env:/app/.env \ --v ${PWD}/lnbits_itest_data/:/app/data \ --v ${PWD}/../../:/app/lnbits/extensions/nwcprovider:ro \ -lnbits/lnbits - +-v ${PWD}/lnbits_itest_data/:/data \ +-v ${PWD}/../../:/nwcprovider \ +-v ${PWD}/../../.devcontainer/start.sh:/start-lnbits.sh:ro \ +-v ${PWD}/../../.devcontainer/setup.sh:/setup.sh:ro \ +mcr.microsoft.com/devcontainers/python:1-3.12 bash -c "while true; do sleep 1000; done" docker network create lnbits_nwcprovider_ext_test_network || true docker network connect lnbits_nwcprovider_ext_test_network lnbits_nwcprovider_ext_nostr_test --alias nostr|| true docker network connect lnbits_nwcprovider_ext_test_network lnbits_nwcprovider_ext_lnbits_test --alias lnbits|| true - +docker exec lnbits_nwcprovider_ext_lnbits_test bash -c "curl -sSL https://install.python-poetry.org | python3 -" +docker exec lnbits_nwcprovider_ext_lnbits_test bash -c "export PATH=\"/home/vscode/.local/bin:\$PATH\" && bash /setup.sh /nwcprovider" +docker exec lnbits_nwcprovider_ext_lnbits_test bash -c "ln -s /app/.env \$HOME/lnbits/.env" +docker exec -d lnbits_nwcprovider_ext_lnbits_test bash -c "export PATH=\"/home/vscode/.local/bin:\$PATH\" && cd \$HOME/lnbits && poetry run lnbits" +