From ca0eca4fa2a3951722ac5b473805b63b353a68b3 Mon Sep 17 00:00:00 2001 From: Mayank Date: Thu, 4 Jun 2020 21:20:24 +0530 Subject: [PATCH 1/4] Mount docker in manager with new env variable --- docker-compose.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 426600d..5e1eaa3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,13 +51,17 @@ services: restart: unless-stopped network_mode: host volumes: - - "${HOME}/db:/db" + - ${HOME}/db:/db + - /var/run/docker.sock:/var/run/docker.sock + - /usr/bin/docker:/usr/bin/docker + - ${HOME}:${HOME} environment: PORT: "3006" USER_PASSWORD_FILE: "/db/user.json" JWT_PUBLIC_KEY_FILE: "/db/jwt-public-key/jwt.pem" JWT_PRIVATE_KEY_FILE: "/db/jwt-private-key/jwt.key" JWT_EXPIRATION: "3600" + DOCKER_COMPOSE_DIRECTORY: $HOME middleware: image: getumbrel/middleware:v0.1.0 command: ["./wait-for-node-manager.sh", "localhost", "npm", "start"] @@ -66,8 +70,8 @@ services: network_mode: host depends_on: [ manager ] volumes: - - "${HOME}/lnd:/lnd" - - "${HOME}/db/jwt-public-key:/jwt-public-key" + - ${HOME}/lnd:/lnd + - ${HOME}/db/jwt-public-key:/jwt-public-key environment: PORT: "3005" BITCOIN_HOST: "0.0.0.0" From 6609425b1a45c0fa90d885e06d3ee89ae40401cd Mon Sep 17 00:00:00 2001 From: Mayank Date: Fri, 5 Jun 2020 07:33:59 +0530 Subject: [PATCH 2/4] Bump Bitcoin Core --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5e1eaa3..aa09c36 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: network_mode: host stop_grace_period: 30s bitcoin: - image: lncm/bitcoind:v0.19.1 + image: lncm/bitcoind:v0.20.0 logging: *default-logging volumes: - ${HOME}/bitcoin:/root/.bitcoin From a90631e1179d4765a0e509b9dcdac0e303315028 Mon Sep 17 00:00:00 2001 From: Mayank Date: Fri, 5 Jun 2020 19:46:11 +0530 Subject: [PATCH 3/4] Changes for testing --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index aa09c36..f8ba199 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,12 +41,12 @@ services: network_mode: host stop_grace_period: 1m30s dashboard: - image: getumbrel/dashboard:v0.2.0 + image: getumbrel/dashboard:master logging: *default-logging restart: always network_mode: host manager: - image: getumbrel/manager:v0.1.0 + image: getumbrel/manager:master logging: *default-logging restart: unless-stopped network_mode: host @@ -63,7 +63,7 @@ services: JWT_EXPIRATION: "3600" DOCKER_COMPOSE_DIRECTORY: $HOME middleware: - image: getumbrel/middleware:v0.1.0 + image: getumbrel/middleware:master command: ["./wait-for-node-manager.sh", "localhost", "npm", "start"] logging: *default-logging restart: unless-stopped From 1d39645ff2352c443cf64685562d360b834c1e36 Mon Sep 17 00:00:00 2001 From: Mayank Date: Tue, 9 Jun 2020 16:23:34 +0530 Subject: [PATCH 4/4] Release tags --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f8ba199..0b3cc6c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,12 +41,12 @@ services: network_mode: host stop_grace_period: 1m30s dashboard: - image: getumbrel/dashboard:master + image: getumbrel/dashboard:v0.2.1 logging: *default-logging restart: always network_mode: host manager: - image: getumbrel/manager:master + image: getumbrel/manager:v0.1.1 logging: *default-logging restart: unless-stopped network_mode: host @@ -63,7 +63,7 @@ services: JWT_EXPIRATION: "3600" DOCKER_COMPOSE_DIRECTORY: $HOME middleware: - image: getumbrel/middleware:master + image: getumbrel/middleware:v0.1.1 command: ["./wait-for-node-manager.sh", "localhost", "npm", "start"] logging: *default-logging restart: unless-stopped