container_names and links directive (#84)

* added container_names

* removed deprecated links directive

* changed container_name related documentation

* added necessary dependencies

* added dependency

* Added Nigiri Travis reference in documentation

README.md

@@ -6,6 +6,8 @@ It offers a [JSON HTTP proxy passtrough](https://github.com/vulpemventures/nigir
 
 You can have Elements too with the `--liquid` flag.
 
+Are you looking to spin-up Nigiri in Travis or Github Action? Look [here](https://github.com/vulpemventures/nigiri-travis)
+
 
 # No time to make a Nigiri yourself?
 ## Pre-built binary
@@ -37,14 +39,14 @@ Go to http://localhost:5000 for quickly inspect the Bitcoin blockchain or http:/
 * Use the Bitcoin CLI inside the box
 
 ```
-$ alias bcli='docker exec -it resources_bitcoin_1 bitcoin-cli -datadir=config'
+$ alias bcli='docker exec -it bitcoin bitcoin-cli -datadir=config'
 $ bcli getblockchaininfo
 ```
 
 * Use the Elements CLI inside the box
 
 ```
-$ alias ecli='docker exec -it resources_liquid_1 elements-cli -datadir=config'
+$ alias ecli='docker exec -it liquid elements-cli -datadir=config'
 $ ecli getblockchaininfo
 ```
 
@@ -147,14 +149,14 @@ $ nigiri logs chopsticks --liquid
 * Use the Bitcoin CLI inside the box
 
 ```
-$ alias bcli='docker exec -it resources_bitcoin_1 bitcoin-cli -datadir=config'
+$ alias bcli='docker exec -it bitcoin bitcoin-cli -datadir=config'
 $ bcli getblockchaininfo
 ```
 
 * Use the Elements CLI inside the box
 
 ```
-$ alias ecli='docker exec -it resources_liquid_1 elements-cli -datadir=config'
+$ alias ecli='docker exec -it liquid elements-cli -datadir=config'
 $ ecli getblockchaininfo
 ```
 

resources/docker-compose-regtest-liquid.yml

@@ -3,6 +3,7 @@ services:
   # RPC daemons
   bitcoin:
     image: vulpemventures/bitcoin:latest
+    container_name: bitcoin
     networks:
       local:
         ipv4_address: 10.10.0.10
@@ -14,6 +15,7 @@ services:
     restart: unless-stopped
   liquid:
     image: vulpemventures/liquid:latest
+    container_name: liquid
     networks:
       local:
         ipv4_address: 10.10.0.11
@@ -26,6 +28,7 @@ services:
   # Block explorer REST servers
   electrs:
     image: vulpemventures/electrs:latest
+    container_name: electrs
     entrypoint:
       - /build/electrs
     command:
@@ -47,8 +50,6 @@ services:
     networks:
       local:
         ipv4_address: 10.10.0.12
-    links:
-      - bitcoin
     depends_on:
       - bitcoin
     ports:
@@ -59,6 +60,7 @@ services:
     restart: unless-stopped
   electrs-liquid:
     image: vulpemventures/electrs-liquid:latest
+    container_name: electrs-liquid
     entrypoint:
       - /build/electrs
     command:
@@ -82,8 +84,6 @@ services:
     networks:
       local:
         ipv4_address: 10.10.0.13
-    links:
-      - liquid
     depends_on:
       - liquid
     ports:
@@ -95,11 +95,10 @@ services:
   # Block explorer frontends
   esplora:
     image: vulpemventures/esplora:latest
+    container_name: esplora
     networks:
       local:
         ipv4_address: 10.10.0.14
-    links:
-      - chopsticks
     depends_on:
       - chopsticks
     environment:
@@ -109,11 +108,10 @@ services:
     restart: unless-stopped
   esplora-liquid:
     image: vulpemventures/esplora:latest
+    container_name: esplora-liquid
     networks:
       local:
         ipv4_address: 10.10.0.15
-    links:
-      - chopsticks-liquid
     depends_on:
       - chopsticks-liquid
     environment:
@@ -124,6 +122,7 @@ services:
   # Chopsticks
   chopsticks:
     image: vulpemventures/nigiri-chopsticks:latest
+    container_name: chopsticks
     command:
       - --use-faucet
       - --use-mining
@@ -134,10 +133,8 @@ services:
       - 10.10.0.12:3002
       - --addr
       - 0.0.0.0:3000
-    links:
-      - electrs
-      - bitcoin
     depends_on:
+      - bitcoin
       - electrs
     ports:
       - ${BITCOIN_CHOPSTICKS_PORT}:3000
@@ -147,6 +144,7 @@ services:
     restart: unless-stopped
   chopsticks-liquid:
     image: vulpemventures/nigiri-chopsticks:latest
+    container_name: chopsticks-liquid
     command:
       - --use-faucet
       - --use-mining
@@ -159,10 +157,8 @@ services:
       - 0.0.0.0:3000
       - --chain
       - liquid
-    links:
-      - electrs-liquid
-      - liquid
     depends_on:
+      - liquid
       - electrs-liquid
     ports:
       - ${LIQUID_CHOPSTICKS_PORT}:3000

resources/docker-compose-regtest.yml

@@ -3,6 +3,7 @@ services:
   # RPC daemon
   bitcoin:
     image: vulpemventures/bitcoin:latest
+    container_name: bitcoin
     networks:
       local:
         ipv4_address: 10.10.0.10
@@ -15,6 +16,7 @@ services:
   # Block explorer server
   electrs:
     image: vulpemventures/electrs:latest
+    container_name: electrs
     entrypoint:
       - /build/electrs
     command:
@@ -36,8 +38,6 @@ services:
     networks:
       local:
         ipv4_address: 10.10.0.11
-    links:
-      - bitcoin
     depends_on:
       - bitcoin
     ports:
@@ -49,11 +49,10 @@ services:
   # Block explorer frontend
   esplora:
     image: vulpemventures/esplora:latest
+    container_name: esplora
     networks:
       local:
         ipv4_address: 10.10.0.12
-    links:
-      - chopsticks
     depends_on:
       - chopsticks
     environment:
@@ -64,6 +63,7 @@ services:
   # Chopsticks
   chopsticks:
     image: vulpemventures/nigiri-chopsticks:latest
+    container_name: chopsticks
     command:
       - --use-faucet
       - --use-mining
@@ -77,10 +77,8 @@ services:
     networks:
       local:
         ipv4_address: 10.10.0.13
-    links:
-      - bitcoin
-      - electrs
     depends_on:
+      - bitcoin
       - electrs
     ports:
       - ${BITCOIN_CHOPSTICKS_PORT}:3000