From 8cc58cc639191d3cdddb6c1b51cd63c64df3b35e Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Fri, 6 Aug 2021 19:43:28 +0300 Subject: [PATCH] [#124] Update neofs-node to v0.23.1 Do not update neo-go to v0.97.1, because it breakes pre-defined chain dump. Signed-off-by: Alex Vanin --- .env | 8 ++++---- services/ir/.ir.env | 2 -- services/storage/.storage.env | 5 +++++ services/storage/docker-compose.yml | 16 ++++++++-------- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.env b/.env index cd65e75..7d5ce0f 100644 --- a/.env +++ b/.env @@ -5,17 +5,17 @@ CA_CERTS_TRUSTED_STORE=/etc/ssl/certs # NeoGo privnet CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.10.0/devenv_mainchain_notary_disabled.gz" -NEOGO_VERSION=0.96.1 +NEOGO_VERSION=0.97.0 # NeoGo sidechain MORPH_CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.10.0/devenv_sidechain.gz" # NeoFS InnerRing nodes -IR_VERSION=0.23.0 +IR_VERSION=0.23.1 IR_IMAGE=nspccdev/neofs-ir # NeoFS Storage nodes -NODE_VERSION=0.23.0 +NODE_VERSION=0.23.1 NODE_IMAGE=nspccdev/neofs-storage # HTTP Gate @@ -31,5 +31,5 @@ LOCODE_DB_URL=https://github.com/nspcc-dev/neofs-locode-db/releases/download/v0. #LOCODE_DB_PATH=/path/to/locode_db # NeoFS CLI binary -NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.23.0/neofs-cli-v0.23.0-amd64.tar.gz +NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.23.1/neofs-cli-amd64.tar.gz #NEOFS_CLI_PATH=/path/to/neofs-cli-binary diff --git a/services/ir/.ir.env b/services/ir/.ir.env index 36904b7..a26c449 100644 --- a/services/ir/.ir.env +++ b/services/ir/.ir.env @@ -18,8 +18,6 @@ NEOFS_IR_METRICS_ADDRESS=:9090 # Toggling the sidechain-only mode NEOFS_IR_WITHOUT_MAINNET=false -NEOFS_IR_WITHOUT_NOTARY=false -NEOFS_IR_WITHOUT_MAIN_NOTARY=true NEOFS_IR_MAINNET_ENDPOINT_CLIENT=http://main_chain:30333 NEOFS_IR_MAINNET_ENDPOINT_NOTIFICATION=ws://main_chain:30333/ws diff --git a/services/storage/.storage.env b/services/storage/.storage.env index 9e94912..3bab36a 100644 --- a/services/storage/.storage.env +++ b/services/storage/.storage.env @@ -32,6 +32,8 @@ NEOFS_MORPH_NOTIFICATION_ENDPOINT=ws://morph_chain:30333/ws ## Dial timeout to connect to notification endpoint ## Default: 5s #NEOFS_MORPH_DIAL_TIMEOUT=1m +# Disable side chain caches +#NEOFS_MORPH_DISABLE_CACHE=true # Main chain section ## Endpoints of main chain RPC nodes (comma-separated) @@ -54,6 +56,9 @@ NEOFS_CONTRACTS_CONTAINER=92c2e316c3ee3cb8993dd0b70ad863e6a23e1cb3 NEOFS_CONTRACTS_NETMAP=7d089f3e06749fdff9be6d01a7913a643fd02bf6 NEOFS_CONTRACTS_REPUTATION=eca6ab6c8a2c37c3e2468b5472298c19002dba01 +# Common storage node attribute +NEOFS_NODE_ATTRIBUTE_0=User-Agent:NeoFS\/0.23 + # Object section ## Worker pool capacity of API Object.Put client calls ## Default: 10 diff --git a/services/storage/docker-compose.yml b/services/storage/docker-compose.yml index 2402c14..f536750 100644 --- a/services/storage/docker-compose.yml +++ b/services/storage/docker-compose.yml @@ -26,8 +26,8 @@ services: - NEOFS_NODE_ADDRESSES=s01.${LOCAL_DOMAIN}:8080 - NEOFS_GRPC_0_ENDPOINT=s01.${LOCAL_DOMAIN}:8080 - NEOFS_CONTROL_GRPC_ENDPOINT=s01.${LOCAL_DOMAIN}:8081 - - NEOFS_NODE_ATTRIBUTE_0=UN-LOCODE:RU MOW - - NEOFS_NODE_ATTRIBUTE_1=Price:22 + - NEOFS_NODE_ATTRIBUTE_1=UN-LOCODE:RU MOW + - NEOFS_NODE_ATTRIBUTE_2=Price:22 healthcheck: test: ["CMD-SHELL", "/healthcheck.sh"] interval: 2s @@ -59,8 +59,8 @@ services: - NEOFS_NODE_ADDRESSES=s02.${LOCAL_DOMAIN}:8080 - NEOFS_GRPC_0_ENDPOINT=s02.${LOCAL_DOMAIN}:8080 - NEOFS_CONTROL_GRPC_ENDPOINT=s02.${LOCAL_DOMAIN}:8081 - - NEOFS_NODE_ATTRIBUTE_0=UN-LOCODE:RU LED - - NEOFS_NODE_ATTRIBUTE_1=Price:33 + - NEOFS_NODE_ATTRIBUTE_1=UN-LOCODE:RU LED + - NEOFS_NODE_ATTRIBUTE_2=Price:33 healthcheck: test: ["CMD-SHELL", "/healthcheck.sh"] interval: 2s @@ -92,8 +92,8 @@ services: - NEOFS_NODE_ADDRESSES=s03.${LOCAL_DOMAIN}:8080 - NEOFS_GRPC_0_ENDPOINT=s03.${LOCAL_DOMAIN}:8080 - NEOFS_CONTROL_GRPC_ENDPOINT=s03.${LOCAL_DOMAIN}:8081 - - NEOFS_NODE_ATTRIBUTE_0=UN-LOCODE:SE STO - - NEOFS_NODE_ATTRIBUTE_1=Price:11 + - NEOFS_NODE_ATTRIBUTE_1=UN-LOCODE:SE STO + - NEOFS_NODE_ATTRIBUTE_2=Price:11 healthcheck: test: ["CMD-SHELL", "/healthcheck.sh"] interval: 2s @@ -131,8 +131,8 @@ services: - NEOFS_GRPC_1_TLS_ENABLED=true - NEOFS_GRPC_1_TLS_CERTIFICATE=/tls.crt - NEOFS_GRPC_1_TLS_KEY=/tls.key - - NEOFS_NODE_ATTRIBUTE_0=UN-LOCODE:FI HEL - - NEOFS_NODE_ATTRIBUTE_1=Price:44 + - NEOFS_NODE_ATTRIBUTE_1=UN-LOCODE:FI HEL + - NEOFS_NODE_ATTRIBUTE_2=Price:44 healthcheck: test: ["CMD-SHELL", "/healthcheck.sh"] interval: 2s