Restart containers & Liquid update (#49)

* change paths * update liquid conf since using elements * add restart option to containers * polish drone & change paths
vulpemventures · Jun 18, 2019 · 1a1f9a2 · 1a1f9a2
1 parent 81b6073
commit 1a1f9a2
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -4,7 +4,7 @@ workspace:
 
 
 pipeline:
-  setup:
+  test:
     image: docker/compose:1.24.0
     environment:
       - DOCKER_HOST=tcp://docker:2375
@@ -27,8 +27,7 @@ services:
   docker:
     image: docker:dind
     privileged: true
-    detach: true
+
   compose:
     image: docker/compose:1.24.0
-    privileged: true
-    detach: true
+    privileged: true
diff --git a/cli/cmd/flags.go b/cli/cmd/flags.go
@@ -5,10 +5,10 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/vulpemventures/nigiri/cli/config"
 	"github.com/mitchellh/go-homedir"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
+	"github.com/vulpemventures/nigiri/cli/config"
 )
 
 var (

diff --git a/resources/docker-compose-regtest-liquid.yml b/resources/docker-compose-regtest-liquid.yml
@@ -10,15 +10,18 @@ services:
       - ${BITCOIN_NODE_PORT}:19001
     volumes:
       - ./volumes/liquidregtest/config/:/config
+    restart: unless-stopped
   liquid:
     image: vulpemventures/liquid:latest
     networks:
       local:
         ipv4_address: 10.10.0.11
     ports:
       - ${LIQUID_NODE_PORT}:18884
+      - 18886:18886
     volumes:
       - ./volumes/liquidregtest/liquid-config/:/config
+    restart: unless-stopped
   # Block explorer REST servers
   electrs:
     image: vulpemventures/electrs:latest
@@ -52,6 +55,7 @@ services:
       - 3002:3002
     volumes:
       - ./volumes/liquidregtest/config/:/config
+    restart: unless-stopped
   electrs-liquid:
     image: vulpemventures/electrs-liquid:latest
     entrypoint:
@@ -84,6 +88,7 @@ services:
       - 3022:3002
     volumes:
       - ./volumes/liquidregtest/liquid-config/:/config
+    restart: unless-stopped
   # Block explorer frontends
   esplora:
     image: vulpemventures/esplora:latest
@@ -96,6 +101,7 @@ services:
       - electrs
     ports:
       - ${BITCOIN_ESPLORA_PORT}:5000
+    restart: unless-stopped
   esplora-liquid:
     image: vulpemventures/esplora-liquid:latest
     networks:
@@ -107,9 +113,10 @@ services:
       - electrs-liquid
     ports:
       - ${LIQUID_ESPLORA_PORT}:5000
+    restart: unless-stopped
   # Chopsticks
   chopsticks:
-    image: vulpemventures/nigiri-chopsticks
+    image: vulpemventures/nigiri-chopsticks:latest
     entrypoint:
       - /build/chopsticks
     command:
@@ -132,8 +139,9 @@ services:
     networks:
       local:
         ipv4_address: 10.10.0.16
+    restart: unless-stopped
   chopsticks-liquid:
-    image: vulpemventures/nigiri-chopsticks
+    image: vulpemventures/nigiri-chopsticks:latest
     entrypoint:
       - /build/chopsticks
     command:
@@ -158,6 +166,7 @@ services:
     networks:
       local:
         ipv4_address: 10.10.0.17
+    restart: unless-stopped
 
 networks:
   local:

diff --git a/resources/docker-compose-regtest.yml b/resources/docker-compose-regtest.yml
@@ -10,6 +10,7 @@ services:
       - ${BITCOIN_NODE_PORT}:19001
     volumes:
       - ./volumes/regtest/config/:/config
+    restart: unless-stopped
   # Block explorer server
   electrs:
     image: vulpemventures/electrs:latest
@@ -43,6 +44,7 @@ services:
       - 3002:3002
     volumes:
       - ./volumes/regtest/config/:/config
+    restart: unless-stopped
   # Block explorer frontend
   esplora:
     image: vulpemventures/esplora:latest
@@ -55,9 +57,10 @@ services:
       - electrs
     ports:
       - ${BITCOIN_ESPLORA_PORT}:5000
+    restart: unless-stopped
   # Chopsticks
   chopsticks:
-    image: vulpemventures/nigiri-chopsticks
+    image: vulpemventures/nigiri-chopsticks:latest
     entrypoint:
       - /build/chopsticks
     command:
@@ -80,6 +83,7 @@ services:
       - electrs
     ports:
       - ${BITCOIN_CHOPSTICKS_PORT}:3000
+    restart: unless-stopped
 
 networks:
   local:

diff --git a/resources/volumes/liquidregtest/liquid-config/liquid.conf b/resources/volumes/liquidregtest/liquid-config/liquid.conf
@@ -1,8 +1,10 @@
-regtest=1
+chain=liquidregtest
 listen=1
-port=18886
 txindex=0
 
+
+[liquidregtest]
+port=18886
 rpcport=18884
 rpcuser=admin1
 rpcpassword=123