From 44c22c2a954a08c05ce17a2f9a619bc98269eedf Mon Sep 17 00:00:00 2001
From: Gilles Filippini <pini@debian.org>
Date: Fri, 27 Jan 2023 13:50:30 +0100
Subject: [PATCH] docker: update compose files w/r last image changes
---
docker-compose.yml | 5 ++---
docker/compose/gdev-mirror.docker-compose.yml | 10 ++-------
.../compose/gdev-validator.docker-compose.yml | 22 ++++++-------------
.../compose/live-template.docker-compose.yml | 11 +---------
4 files changed, 12 insertions(+), 36 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index db065fc28..5a575fc10 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
duniter-v2s:
container_name: duniter-v2s
# choose the version of the image here
- image: duniter/duniter-v2s:v0.4.0
+ image: duniter/duniter-v2s:latest
ports:
# telemetry
- 9615:9615
@@ -19,8 +19,7 @@ services:
- 30333:30333
environment:
DUNITER_NODE_NAME: "duniter_local"
- DUNITER_CHAIN_NAME: "dev"
- #DUNITER_DISABLE_PROMETHEUS: "false"
+ DUNITER_CHAIN_NAME: "gdev"
volumes:
- duniter-local-data:/var/lib/duniter
diff --git a/docker/compose/gdev-mirror.docker-compose.yml b/docker/compose/gdev-mirror.docker-compose.yml
index a0643580d..039ab56b7 100644
--- a/docker/compose/gdev-mirror.docker-compose.yml
+++ b/docker/compose/gdev-mirror.docker-compose.yml
@@ -4,7 +4,7 @@ version: "3.5"
services:
duniter-rpc:
- image: duniter/duniter-v2s:v0.4.0
+ image: duniter/duniter-v2s:latest
restart: unless-stopped
ports:
# telemetry
@@ -20,14 +20,8 @@ services:
- duniter-rpc-data:/var/lib/duniter/
environment:
- DUNITER_CHAIN_NAME=gdev
- command:
- - "--node-key-file"
- - "/var/lib/duniter/node.key"
- - "--public-addr"
# SERVER_DOMAIN should be replaced by a domain name that point on your server
- - "/dns/${SERVER_DOMAIN?SERVER_DOMAIN should be set}/tcp/30333/ws"
- - "--rpc-cors"
- - "all"
+ - DUNITER_PUBLIC_ADDR=/dns/${SERVER_DOMAIN?SERVER_DOMAIN should be set}/tcp/30333/ws
volumes:
duniter-rpc-data:
diff --git a/docker/compose/gdev-validator.docker-compose.yml b/docker/compose/gdev-validator.docker-compose.yml
index 58961ae6f..655dd1a20 100644
--- a/docker/compose/gdev-validator.docker-compose.yml
+++ b/docker/compose/gdev-validator.docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.5"
services:
duniter-rpc:
- image: duniter/duniter-v2s:v0.4.0
+ image: duniter/duniter-v2s:latest
restart: unless-stopped
ports:
# telemetry
@@ -18,15 +18,11 @@ services:
- duniter-rpc-data:/var/lib/duniter/
environment:
- DUNITER_CHAIN_NAME=gdev
- command:
- - "--node-key-file=/var/lib/duniter/node.key"
- - "--public-addr"
- # SERVER_DOMAIN should be replaced by a domain name that point on your server
- - "/dns/${SERVER_DOMAIN?SERVER_DOMAIN should be set}/tcp/30333/ws"
- - "--rpc-cors=all"
+ # RPC_SERVER_DOMAIN should be replaced by a domain name that point on your server
+ - DUNITER_PUBLIC_ADDR=/dns/${RPC_SERVER_DOMAIN?RPC_SERVER_DOMAIN should be set}/tcp/30333/ws
duniter-validator:
- image: duniter/duniter-v2s:v0.4.0
+ image: duniter/duniter-v2s:latest
restart: unless-stopped
ports:
# telemetry
@@ -42,12 +38,8 @@ services:
- duniter-validator-data:/var/lib/duniter/
environment:
- DUNITER_CHAIN_NAME=gdev
+ # VALIDATOR_SERVER_DOMAIN should be replaced by a domain name that point on your server
+ - DUNITER_PUBLIC_ADDR=/dns/${VALIDATOR_SERVER_DOMAIN?VALIDATOR_SERVER_DOMAIN should be set}/tcp/30333
+ - DUNITER_VALIDATOR=true
command:
- - "--node-key-file=/var/lib/duniter/node.key"
- - "--public-addr"
- # SERVER_DOMAIN should be replaced by a domain name that point on your server
- - "/dns/${SERVER_DOMAIN?SERVER_DOMAIN should be set}/tcp/30333"
- - "--rpc-cors=all"
- - "--rpc-methods=Unsafe"
- - "--validator"
- "--pruning=14400"
diff --git a/docker/compose/live-template.docker-compose.yml b/docker/compose/live-template.docker-compose.yml
index 93564f0ea..643ae8c4e 100644
--- a/docker/compose/live-template.docker-compose.yml
+++ b/docker/compose/live-template.docker-compose.yml
@@ -14,10 +14,6 @@ services:
command:
- "--bootnodes"
- "/dns/duniter-validator/tcp/30333/p2p/VALIDATOR_NODE_KEY"
- - "--node-key-file"
- - "/var/lib/duniter/node-key"
- - "--rpc-cors"
- - "all"
duniter-validator:
image: duniter/duniter-v2s:DUNITER_IMAGE_TAG
@@ -29,12 +25,7 @@ services:
- ./duniter-validator/:/var/lib/duniter/
environment:
- DUNITER_CHAIN_NAME=/var/lib/duniter/CURRENCY-raw.json
+ - DUNITER_VALIDATOR=true
command:
- "--bootnodes"
- "/dns/duniter-rpc/tcp/30333/p2p/RPC_NODE_KEY"
- - "--node-key-file"
- - "/var/lib/duniter/node-key"
- - "--rpc-methods=Unsafe"
- - "--validator"
- - "--rpc-cors"
- - "all"
--
GitLab