mirror of
https://github.com/lightningnetwork/lnd.git
synced 2025-09-29 19:42:40 +02:00
multi: fix Postgres on Travis
Fixes the docker build that was caused by https://github.com/docker-library/postgres/issues/884. Using the alpine and version 13 image avoids the problem introduced with postgres 14 and debian bullseye.
This commit is contained in:
@@ -64,7 +64,7 @@ jobs:
|
|||||||
- name: Bitcoind Integration with postgres (txindex enabled)
|
- name: Bitcoind Integration with postgres (txindex enabled)
|
||||||
script:
|
script:
|
||||||
- bash ./scripts/install_bitcoind.sh
|
- bash ./scripts/install_bitcoind.sh
|
||||||
- make itest-parallel backend=bitcoind dbbackend=postgres
|
- make itest-parallel backend=bitcoind dbbackend=postgres POSTGRES_START_DELAY=10
|
||||||
|
|
||||||
- name: Bitcoind Integration (txindex disabled)
|
- name: Bitcoind Integration (txindex disabled)
|
||||||
script:
|
script:
|
||||||
|
5
Makefile
5
Makefile
@@ -194,10 +194,11 @@ ifeq ($(dbbackend),postgres)
|
|||||||
|
|
||||||
# Start a fresh postgres instance. Allow a maximum of 500 connections.
|
# Start a fresh postgres instance. Allow a maximum of 500 connections.
|
||||||
# This is required for the async benchmark to pass.
|
# This is required for the async benchmark to pass.
|
||||||
docker run --name lnd-postgres -e POSTGRES_PASSWORD=postgres -p 6432:5432 -d postgres -N 500
|
docker run --name lnd-postgres -e POSTGRES_PASSWORD=postgres -p 6432:5432 -d postgres:13-alpine -N 500
|
||||||
|
docker logs -f lnd-postgres &
|
||||||
|
|
||||||
# Wait for the instance to be started.
|
# Wait for the instance to be started.
|
||||||
sleep 3
|
sleep $(POSTGRES_START_DELAY)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
itest-only: db-instance
|
itest-only: db-instance
|
||||||
|
@@ -7,6 +7,7 @@ EXEC_SUFFIX =
|
|||||||
COVER_PKG = $$(go list -deps -tags="$(DEV_TAGS)" ./... | grep '$(PKG)' | grep -v lnrpc)
|
COVER_PKG = $$(go list -deps -tags="$(DEV_TAGS)" ./... | grep '$(PKG)' | grep -v lnrpc)
|
||||||
NUM_ITEST_TRANCHES = 4
|
NUM_ITEST_TRANCHES = 4
|
||||||
ITEST_PARALLELISM = $(NUM_ITEST_TRANCHES)
|
ITEST_PARALLELISM = $(NUM_ITEST_TRANCHES)
|
||||||
|
POSTGRES_START_DELAY = 5
|
||||||
|
|
||||||
# If rpc option is set also add all extra RPC tags to DEV_TAGS
|
# If rpc option is set also add all extra RPC tags to DEV_TAGS
|
||||||
ifneq ($(with-rpc),)
|
ifneq ($(with-rpc),)
|
||||||
|
Reference in New Issue
Block a user