From 9c3ff7981e9cbc371116f18c0eadd13eeb6091f8 Mon Sep 17 00:00:00 2001
From: Gilles Filippini <pini@debian.org>
Date: Tue, 3 Jan 2023 22:32:33 +0100
Subject: [PATCH] docker: DUNITER_INSTANCE_NAME -> DUNITER_NODE_NAME
DUNITER_INSTANCE_NAME is still accepted if DUNITER_NODE_NAME is not
defined.
---
docker-compose.yml | 2 +-
docker/docker-entrypoint | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index c7957b145..db065fc28 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,7 +18,7 @@ services:
# p2p
- 30333:30333
environment:
- DUNITER_INSTANCE_NAME: "duniter_local"
+ DUNITER_NODE_NAME: "duniter_local"
DUNITER_CHAIN_NAME: "dev"
#DUNITER_DISABLE_PROMETHEUS: "false"
volumes:
diff --git a/docker/docker-entrypoint b/docker/docker-entrypoint
index 28f3b9228..5c745caef 100755
--- a/docker/docker-entrypoint
+++ b/docker/docker-entrypoint
@@ -12,8 +12,9 @@ function ternary () {
fi
}
-if [ -n "$DUNITER_INSTANCE_NAME" ]; then
- set -- "$@" --name "$DUNITER_INSTANCE_NAME"
+DUNITER_NODE_NAME="${DUNITER_NODE_NAME:-$DUNITER_INSTANCE_NAME}"
+if [ -n "$DUNITER_NODE_NAME" ]; then
+ set -- "$@" --name "$DUNITER_NODE_NAME"
fi
DUNITER_DISABLE_PROMETHEUS=$(boolean "${DUNITER_DISABLE_PROMETHEUS:-false}")
--
GitLab