Simplify container names (#62)

* Rename docker lnd container

* Rename itest containers to avoid conflict with main containers

docker/docker-compose.yml

@@ -11,9 +11,9 @@ services:
       - postgres_dir:/var/lib/postgresql/data
       - ./createdb.sql:/docker-entrypoint-initdb.d/init.sql
 
-  lnd_sqkserver:
+  lnd:
     image: lnd
-    container_name: lnd_sqkserver
+    container_name: lnd
     build:
       context: ../
       dockerfile: docker/lnd/Dockerfile
@@ -43,7 +43,7 @@ services:
       - 8774:8774
       - 18774:18774
     links:
-      - "lnd_sqkserver:lnd"
+      - "lnd:lnd"
     depends_on:
       - db
     sysctls:

itests/config.ini

@@ -3,6 +3,7 @@ network=simnet
 
 [lnd]
 host=lnd
+external_host=lnd_server
 port=9735
 rpc_port=10009
 tls_cert_path=/root/.lnd/tls.cert

itests/docker-compose.yml

@@ -8,8 +8,8 @@ services:
       context: ../
       dockerfile: docker/btcd/Dockerfile
     volumes:
-      - shared_test:/rpc
-      - bitcoin_test:/data
+      - test_shared:/rpc
+      - test_bitcoin:/data
     environment:
       - RPCUSER
       - RPCPASS
@@ -30,8 +30,8 @@ services:
       context: ../
       dockerfile: docker/btcd/Dockerfile
     volumes:
-      - shared_test:/rpc
-      - bitcoin_test:/data
+      - test_shared:/rpc
+      - test_bitcoin:/data
     environment:
       - RPCUSER
       - RPCPASS
@@ -42,9 +42,9 @@ services:
       - "btcd:rpcserver"
     entrypoint: ["./start-btcctl.sh"]
 
-  lnd_alice:
+  lnd_client:
     image: lnd
-    container_name: lnd_alice
+    container_name: test_lnd_client
     build:
       context: ../
       dockerfile: docker/lnd/Dockerfile
@@ -55,15 +55,15 @@ services:
       - CHAIN
       - DEBUG
     volumes:
-      - shared_test:/rpc
-      - lnd_dir_alice:/root/.lnd
+      - test_shared:/rpc
+      - test_lnd_client_dir:/root/.lnd
     links:
       - "btcd:blockchain"
     entrypoint: ["./start-lnd.sh"]
 
-  lnd:
+  lnd_server:
     image: lnd
-    container_name: lnd
+    container_name: test_lnd_server
     build:
       context: ../
       dockerfile: docker/lnd/Dockerfile
@@ -74,14 +74,15 @@ services:
       - CHAIN
       - DEBUG
     volumes:
-      - shared_test:/rpc
-      - lnd_dir_sqkserver:/root/.lnd
+      - test_shared:/rpc
+      - test_lnd_server_dir:/root/.lnd
     links:
       - "btcd:blockchain"
     entrypoint: ["./start-lnd.sh"]
 
   db:
     image: postgres
+    container_name: test_db
     environment:
       - POSTGRES_DB=postgres
       - POSTGRES_USER=postgres
@@ -91,15 +92,15 @@ services:
 
   sqkserver:
     image: sqkserver
-    container_name: sqkserver
+    container_name: test_sqkserver
     build:
       context: ../
       dockerfile: docker/sqkserver/Dockerfile
     volumes:
-      - lnd_dir_sqkserver:/root/.lnd
+      - test_lnd_server_dir:/root/.lnd
       - ./config.ini:/app/config.ini
     links:
-      - "lnd:lnd"
+      - "lnd_server:lnd"
     depends_on:
       - db
     sysctls:
@@ -112,24 +113,24 @@ services:
       context: ../
       dockerfile: docker/test/Dockerfile
     volumes:
-      - shared_test:/rpc
-      - lnd_dir_alice:/root/.lnd
+      - test_shared:/rpc
+      - test_lnd_client_dir:/root/.lnd
     links:
-      - "lnd_alice:lnd"
+      - "lnd_client:lnd"
     command: tail -f /dev/null
 
 volumes:
   # btcctl and lnd containers.
-  shared_test:
+  test_shared:
     driver: local
 
-  # bitcoin_test volume is needed for maintaining blockchain persistence
+  # test_bitcoin volume is needed for maintaining blockchain persistence
   # during btcd container recreation.
-  bitcoin_test:
+  test_bitcoin:
     driver: local
 
   # lnd_dir volume is needed for sharing tht tls certificate
-  lnd_dir_alice:
+  test_lnd_client_dir:
     driver: local
-  lnd_dir_sqkserver:
+  test_lnd_server_dir:
     driver: local

itests/generate_blocks.sh

@@ -2,9 +2,9 @@
 
 
 while true; do
-    alice_address=$(docker exec -it lnd_alice lncli --network=simnet newaddress np2wkh | jq .address -r)
-    MINING_ADDRESS=$alice_address docker-compose up -d btcd
-    echo "Mining 1 blocks to address: $alice_address ..."
+    client_address=$(docker exec -it test_lnd_client lncli --network=simnet newaddress np2wkh | jq .address -r)
+    MINING_ADDRESS=$client_address docker-compose up -d btcd
+    echo "Mining 1 blocks to address: $client_address ..."
     docker-compose run btcctl generate 400
     sleep 10
 done

itests/run_itest.sh

@@ -17,11 +17,11 @@ docker-compose down --volumes
 docker-compose build
 docker-compose up -d
 
-# Initialize the blockchain with miner rewards going to alice.
+# Initialize the blockchain with miner rewards going to the test client.
 sleep 10
-alice_address=$(docker exec -it lnd_alice lncli --network=simnet newaddress np2wkh | jq .address -r)
-MINING_ADDRESS=$alice_address docker-compose up -d btcd
-echo "Mining 400 blocks to address: $alice_address ..."
+client_address=$(docker exec -it test_lnd_client lncli --network=simnet newaddress np2wkh | jq .address -r)
+MINING_ADDRESS=$client_address docker-compose up -d btcd
+echo "Mining 400 blocks to address: $client_address ..."
 docker-compose run btcctl generate 400
 echo "Finished mining blocks."
 sleep 10