From 6fd4940a0a603ac2150c9fbb521afcfdd91507bf Mon Sep 17 00:00:00 2001 From: Jonathan Zernik Date: Thu, 2 Jul 2020 22:45:12 -0700 Subject: [PATCH] Use btcd btcctl test containers (#63) * Use containers with test in name for btcd and btcctl * Remove duplication of createdb script --- docker/createdb.sql => createdb.sql | 0 docker/docker-compose.yml | 2 +- itests/createdb.sql | 3 --- itests/docker-compose.yml | 6 +++--- 4 files changed, 4 insertions(+), 7 deletions(-) rename docker/createdb.sql => createdb.sql (100%) delete mode 100644 itests/createdb.sql diff --git a/docker/createdb.sql b/createdb.sql similarity index 100% rename from docker/createdb.sql rename to createdb.sql diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index fd42eb34..f031a559 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -9,7 +9,7 @@ services: - POSTGRES_PASSWORD=postgres volumes: - postgres_dir:/var/lib/postgresql/data - - ./createdb.sql:/docker-entrypoint-initdb.d/init.sql + - ../createdb.sql:/docker-entrypoint-initdb.d/init.sql lnd: image: lnd diff --git a/itests/createdb.sql b/itests/createdb.sql deleted file mode 100644 index 24618bd8..00000000 --- a/itests/createdb.sql +++ /dev/null @@ -1,3 +0,0 @@ -CREATE DATABASE squeakserver; - -\connect squeakserver; diff --git a/itests/docker-compose.yml b/itests/docker-compose.yml index f04ac709..a1d29649 100644 --- a/itests/docker-compose.yml +++ b/itests/docker-compose.yml @@ -3,7 +3,7 @@ services: btcd: image: btcd - container_name: btcd + container_name: test_btcd build: context: ../ dockerfile: docker/btcd/Dockerfile @@ -25,7 +25,7 @@ services: btcctl: image: btcd - container_name: btcctl + container_name: test_btcctl build: context: ../ dockerfile: docker/btcd/Dockerfile @@ -88,7 +88,7 @@ services: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=postgres volumes: - - ./createdb.sql:/docker-entrypoint-initdb.d/init.sql + - ../createdb.sql:/docker-entrypoint-initdb.d/init.sql sqkserver: image: sqkserver