From 64643b25a81fce9905460a105c0754ae2a29fb38 Mon Sep 17 00:00:00 2001
From: Jonathan Zernik <yzernik@gmail.com>
Date: Mon, 23 Nov 2020 20:43:19 -0500
Subject: [PATCH] Use docker compose overrides for testnet mainnet (#482)

* Use default override file for docker-compose testnet

* Add mainnet docker-compose override file

* Put common environment variables in main docker-compose file

* Update readme with instructions for mainnet override
---
 README.md                          |  4 ++--
 docker/docker-compose.mainnet.yml  | 27 +++++++++++++++++++++++++++
 docker/docker-compose.override.yml | 27 +++++++++++++++++++++++++++
 docker/docker-compose.yml          | 25 -------------------------
 4 files changed, 56 insertions(+), 27 deletions(-)
 create mode 100644 docker/docker-compose.mainnet.yml
 create mode 100644 docker/docker-compose.override.yml

diff --git a/README.md b/README.md
index 6e12b101..e0e4a4f1 100644
--- a/README.md
+++ b/README.md
@@ -16,9 +16,9 @@ Node for Squeak protocol
 	$ docker-compose build
 	$ docker-compose up
 	```
-- If you want to use mainnet, run with the `NETWORK` environment variable:
+- If you want to use mainnet, run with the `docker-compose.mainnet.yml` override file:
 	```
-	$ NETWORK=mainnet docker-compose up
+	$ docker-compose -f docker-compose.yml -f docker-compose.mainnet.yml up
 	```
 - Go to http://localhost:12994/ and use the username/password in **docker/config.ini** to log in.
 
diff --git a/docker/docker-compose.mainnet.yml b/docker/docker-compose.mainnet.yml
new file mode 100644
index 00000000..22b5a37f
--- /dev/null
+++ b/docker/docker-compose.mainnet.yml
@@ -0,0 +1,27 @@
+version: '3'
+services:
+
+  bitcoin-core:
+    command:
+      -printtoconsole
+      -testnet=0
+      -server=1
+      -rpcbind=0.0.0.0
+      -rpcallowip=0.0.0.0/0
+      -rpcuser=devuser
+      -rpcpassword=devpass
+      -zmqpubrawblock=tcp://0.0.0.0:28332
+      -zmqpubrawtx=tcp://0.0.0.0:28333
+
+  lnd:
+    environment:
+      - NETWORK=mainnet
+
+  squeaknode:
+    environment:
+      - NETWORK=mainnet
+
+volumes:
+  # shared volume is needed for sharing the btcd certificate
+  shared:
+    driver: local
diff --git a/docker/docker-compose.override.yml b/docker/docker-compose.override.yml
new file mode 100644
index 00000000..6bf72342
--- /dev/null
+++ b/docker/docker-compose.override.yml
@@ -0,0 +1,27 @@
+version: '3'
+services:
+
+  bitcoin-core:
+    command:
+      -printtoconsole
+      -testnet=1
+      -server=1
+      -rpcbind=0.0.0.0
+      -rpcallowip=0.0.0.0/0
+      -rpcuser=devuser
+      -rpcpassword=devpass
+      -zmqpubrawblock=tcp://0.0.0.0:28332
+      -zmqpubrawtx=tcp://0.0.0.0:28333
+
+  lnd:
+    environment:
+      - NETWORK=testnet
+
+  squeaknode:
+    environment:
+      - NETWORK=testnet
+
+volumes:
+  # shared volume is needed for sharing the btcd certificate
+  shared:
+    driver: local
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 72c98edf..de0ae8eb 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,34 +1,11 @@
 version: '3'
 services:
 
-  # btcd:
-  #   image: btcd
-  #   container_name: btcd
-  #   build:
-  #     context: ../
-  #     dockerfile: docker/btcd/Dockerfile
-  #   volumes:
-  #     - shared:/rpc
-  #     - ~/.btcd/data:/data
-  #   environment:
-  #     - NETWORK
-  #   entrypoint: ["./start-btcd.sh"]
-
   bitcoin-core:
     image: ruimarinho/bitcoin-core
     container_name: bitcoin-core
     volumes:
       - ~/.bitcoin:/home/bitcoin/.bitcoin
-    command:
-      -printtoconsole
-      -testnet=1
-      -server=1
-      -rpcbind=0.0.0.0
-      -rpcallowip=0.0.0.0/0
-      -rpcuser=devuser
-      -rpcpassword=devpass
-      -zmqpubrawblock=tcp://0.0.0.0:28332
-      -zmqpubrawtx=tcp://0.0.0.0:28333
 
   lnd:
     image: lnd
@@ -37,7 +14,6 @@ services:
       context: ../
       dockerfile: docker/lnd/Dockerfile
     environment:
-      - NETWORK
       - RPCHOST=bitcoin-core
       - BACKEND=bitcoind
     volumes:
@@ -61,7 +37,6 @@ services:
       - WEBADMIN_USE_SSL
       - WEBADMIN_LOGIN_DISABLED
       - WEBADMIN_ALLOW_CORS
-      - NETWORK
       - LOG_LEVEL
       - SQUEAKNODE_SYNC_INTERVAL_S
     volumes: