Update environment for single inner ring node

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
2021-03-23 09:43:44 +03:00 · 2021-03-23 09:43:44 +03:00 · d2484d973c
commit d2484d973c
parent a3890fb500
12 changed files with 16 additions and 147 deletions
--- a/.env
+++ b/.env
@ -3,18 +3,18 @@ LOCAL_DOMAIN=neofs.devenv
 IPV4_PREFIX=192.168.130

 # NeoGo privnet
-CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.5.1/devenv_mainchain.gz"
+CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.6.0/devenv_mainchain.gz"
 NEOGO_VERSION=0.94.0

 # NeoGo sidechain
-MORPH_CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.5.1/devenv_sidechain.gz"
+MORPH_CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.6.0/devenv_sidechain.gz"

 # NeoFS InnerRing nodes
-IR_VERSION=0.17.0
+IR_VERSION=0.18.0
 IR_IMAGE=nspccdev/neofs-ir

 # NeoFS Storage nodes
-NODE_VERSION=0.17.0
+NODE_VERSION=0.18.0
 NODE_IMAGE=nspccdev/neofs-storage

 # HTTP Gate
--- a/services/ir/.hosts
+++ b/services/ir/.hosts
@ -1,7 +1 @@
 IPV4_PREFIX.61 ir01.LOCAL_DOMAIN
-IPV4_PREFIX.62 ir02.LOCAL_DOMAIN
-IPV4_PREFIX.63 ir03.LOCAL_DOMAIN
-IPV4_PREFIX.64 ir04.LOCAL_DOMAIN
-IPV4_PREFIX.65 ir05.LOCAL_DOMAIN
-IPV4_PREFIX.66 ir06.LOCAL_DOMAIN
-IPV4_PREFIX.67 ir07.LOCAL_DOMAIN
--- a/services/ir/.ir.env
+++ b/services/ir/.ir.env
@ -19,23 +19,17 @@ NEOFS_IR_TIMERS_DISTRIBUTE_BASIC_INCOME_DIV=4
 NEOFS_IR_EMIT_STORAGE_AMOUNT=100000000
 NEOFS_IR_NETMAP_CLEANER_ENABLED=true

-NEOFS_IR_CONTRACTS_NETMAP=fbf9cd97c4c04cbf26cad1b3f07c7905a3192121
-NEOFS_IR_CONTRACTS_BALANCE=46b3f451a4b34730f82299091962cb29d826dc52
-NEOFS_IR_CONTRACTS_CONTAINER=c64a0216604354adb7ecbd7965775b20c83d61b3
-NEOFS_IR_CONTRACTS_NEOFS=1078523e56279461899c2759253f8298a468e5ce
-NEOFS_IR_CONTRACTS_AUDIT=097981782f475fcd4ac26e55227366fe1dd5a746
-NEOFS_IR_CONTRACTS_PROXY=9f3553a1c6ec7692b7f7b95722534bebb94a07b9
+NEOFS_IR_CONTRACTS_NETMAP=15105c7bbae4cfed65cbe2d5ddb26939d022e8a4
+NEOFS_IR_CONTRACTS_BALANCE=66bf21f7f481b64c492e5eb4e316355b154a15a5
+NEOFS_IR_CONTRACTS_CONTAINER=b319c024c000e5d7268eab2edd8e8328251cada3
+NEOFS_IR_CONTRACTS_NEOFS=1e6d8b8e1a7c976649dc630062d8b281cb9c2615
+NEOFS_IR_CONTRACTS_AUDIT=5feaa5e00969ea2592afec981ffc3e862643e9a6
+NEOFS_IR_CONTRACTS_PROXY=dcc891f08c8126ac2910bad3fe50678a70d9cb82

 # Amount of alphabetic contracts in network, 7 by default.
 # Limited by the number of letters in Glagolitic.
-#NEOFS_IR_CONTRACTS_ALPHABET_AMOUNT=3
-NEOFS_IR_CONTRACTS_ALPHABET_AZ=f3cd47942b3cb3c1c03868cd1c2e8ff9a1c5499d
-NEOFS_IR_CONTRACTS_ALPHABET_BUKY=7ce4cf7e05ae844ed6b75ef1ce8eb6564362a49e
-NEOFS_IR_CONTRACTS_ALPHABET_VEDI=dd42a19885e00bb40b358bacd71548719402ddc7
-NEOFS_IR_CONTRACTS_ALPHABET_GLAGOLI=3f0f599e7546fe6227d0c154a6426d069c1f672d
-NEOFS_IR_CONTRACTS_ALPHABET_DOBRO=15ccc39c5adf92aa1981e963b5e7601a476cd895
-NEOFS_IR_CONTRACTS_ALPHABET_YEST=6e5ed974e1f31b442c3c31f780bb40f82a2efa8f
-NEOFS_IR_CONTRACTS_ALPHABET_ZHIVETE=38aa61d701fe7bac2ae8005516750ff54107a995
+NEOFS_IR_CONTRACTS_ALPHABET_AMOUNT=1
+NEOFS_IR_CONTRACTS_ALPHABET_AZ=bd12c9e04aa0031494ac28eec3ed1820602f2595

 NEOFS_IR_MORPH_VALIDATORS=02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2
 NEOFS_IR_AUDIT_PDP_MAX_SLEEP_INTERVAL=100ms
--- a/services/ir/01.key
+++ b/services/ir/01.key
@ -1 +1 @@
-Ä(´ ooÞŸŠüùJÍÞ5ª&ìô/àÉBsB]í!
+4{Â˝ž·ąô!z&ÜZ=*<%ěáČżńŐˇFŞôn46
--- a/services/ir/02.key
+++ b/services/ir/02.key
@ -1 +0,0 @@
-!*!ÆÅ	Haƒ†~=?¢¡õXB¼<42>@™ý–«B~
--- a/services/ir/03.key
+++ b/services/ir/03.key
@ -1 +0,0 @@
-Hｻ枝Mvｹ｡ﾊKeFR<46>Mo<4D>ｪｯｭ<EFBDAF>ｶ><3E>ｿ<EFBFBD>/
--- a/services/ir/04.key
+++ b/services/ir/04.key
@ -1 +0,0 @@
-ßüìY6d<36>oƒË…_Z)ß?œÌ“'£Á$Ñg§
--- a/services/ir/05.key
+++ b/services/ir/05.key
--- a/services/ir/06.key
+++ b/services/ir/06.key
@ -1 +0,0 @@
-“‹é"Ë‰E¢k±jšõ¼Îp<¿“¼²$î¹šâ9;–
--- a/services/ir/07.key
+++ b/services/ir/07.key
@ -1 +0,0 @@
-T£
ïm«pªUÕ%ÅKx+g–ÿÕºLe„½"-3r
--- a/services/ir/docker-compose.yml
+++ b/services/ir/docker-compose.yml
@ -22,120 +22,6 @@ services:
    environment:
    - NEOFS_IR_KEY=/01.key

-  ir02:
-    image: ${IR_IMAGE}:${IR_VERSION}
-    domainname: ${LOCAL_DOMAIN}
-    hostname: ir02
-    container_name: ir02
-    restart: on-failure
-    networks:
-      ir_int:
-      internet:
-        ipv4_address: ${IPV4_PREFIX}.62
-    volumes:
-      - ./02.key:/02.key
-      - ./../../vendor/hosts:/etc/hosts
-      - ./../../vendor/locode_db:/locode/db
-    stop_signal: SIGKILL
-    env_file: [ ".env", ".ir.env" ]
-    environment:
-    - NEOFS_IR_KEY=/02.key
-
-  ir03:
-    image: ${IR_IMAGE}:${IR_VERSION}
-    domainname: ${LOCAL_DOMAIN}
-    hostname: ir03
-    container_name: ir03
-    restart: on-failure
-    networks:
-      ir_int:
-      internet:
-        ipv4_address: ${IPV4_PREFIX}.63
-    volumes:
-      - ./03.key:/03.key
-      - ./../../vendor/hosts:/etc/hosts
-      - ./../../vendor/locode_db:/locode/db
-    stop_signal: SIGKILL
-    env_file: [ ".env", ".ir.env" ]
-    environment:
-    - NEOFS_IR_KEY=/03.key
-
-  ir04:
-    image: ${IR_IMAGE}:${IR_VERSION}
-    domainname: ${LOCAL_DOMAIN}
-    hostname: ir04
-    container_name: ir04
-    restart: on-failure
-    networks:
-      ir_int:
-      internet:
-        ipv4_address: ${IPV4_PREFIX}.64
-    volumes:
-      - ./04.key:/04.key
-      - ./../../vendor/hosts:/etc/hosts
-      - ./../../vendor/locode_db:/locode/db
-    stop_signal: SIGKILL
-    env_file: [ ".env", ".ir.env" ]
-    environment:
-    - NEOFS_IR_KEY=/04.key
-
-  ir05:
-    image: ${IR_IMAGE}:${IR_VERSION}
-    domainname: ${LOCAL_DOMAIN}
-    hostname: ir05
-    container_name: ir05
-    restart: on-failure
-    networks:
-      ir_int:
-      internet:
-        ipv4_address: ${IPV4_PREFIX}.65
-    volumes:
-      - ./05.key:/05.key
-      - ./../../vendor/hosts:/etc/hosts
-      - ./../../vendor/locode_db:/locode/db
-    stop_signal: SIGKILL
-    env_file: [ ".env", ".ir.env" ]
-    environment:
-    - NEOFS_IR_KEY=/05.key
-
-  ir06:
-    image: ${IR_IMAGE}:${IR_VERSION}
-    domainname: ${LOCAL_DOMAIN}
-    hostname: ir06
-    container_name: ir06
-    restart: on-failure
-    networks:
-      ir_int:
-      internet:
-        ipv4_address: ${IPV4_PREFIX}.66
-    volumes:
-      - ./06.key:/06.key
-      - ./../../vendor/hosts:/etc/hosts
-      - ./../../vendor/locode_db:/locode/db
-    stop_signal: SIGKILL
-    env_file: [ ".env", ".ir.env" ]
-    environment:
-    - NEOFS_IR_KEY=/06.key
-
-  ir07:
-    image: ${IR_IMAGE}:${IR_VERSION}
-    domainname: ${LOCAL_DOMAIN}
-    hostname: ir07
-    container_name: ir07
-    restart: on-failure
-    networks:
-      ir_int:
-      internet:
-        ipv4_address: ${IPV4_PREFIX}.67
-    volumes:
-      - ./07.key:/07.key
-      - ./../../vendor/hosts:/etc/hosts
-      - ./../../vendor/locode_db:/locode/db
-    stop_signal: SIGKILL
-    env_file: [ ".env", ".ir.env" ]
-    environment:
-    - NEOFS_IR_KEY=/07.key
-
 networks:
  ir_int:
  internet:
--- a/services/storage/.storage.env
+++ b/services/storage/.storage.env
@ -1,9 +1,9 @@
 NEOFS_MORPH_RPC_ENDPOINT=http://morph_chain:30333
 NEOFS_MORPH_NOTIFICATION_ENDPOINT=ws://morph_chain:30333/ws

-NEOFS_ACCOUNTING_SCRIPTHASH=46b3f451a4b34730f82299091962cb29d826dc52
-NEOFS_CONTAINER_SCRIPTHASH=c64a0216604354adb7ecbd7965775b20c83d61b3
-NEOFS_NETMAP_SCRIPTHASH=fbf9cd97c4c04cbf26cad1b3f07c7905a3192121
+NEOFS_ACCOUNTING_SCRIPTHASH=66bf21f7f481b64c492e5eb4e316355b154a15a5
+NEOFS_CONTAINER_SCRIPTHASH=b319c024c000e5d7268eab2edd8e8328251cada3
+NEOFS_NETMAP_SCRIPTHASH=15105c7bbae4cfed65cbe2d5ddb26939d022e8a4

 NEOFS_BOOTSTRAP_PERIODIC_ENABLED=true
				`@ -1 +0,0 @@`
				`!*!ÆÅ Haƒ†~=?¢¡õXB¼<42>@™ý–«B~`
				`@ -1 +0,0 @@`
				`Hｻ枝Mvｹ｡ﾊKeFR<46>Mo<4D>ｪｯｭ<EFBDAF>ｶ><3E>ｿ<EFBFBD>/`
				`@ -1 +0,0 @@`
				`ßüìY6d<36>oƒË…_Z)ß?œÌ“'£Á$Ñg§`
				`@ -1 +0,0 @@`
				`“‹é"Ë‰E¢k±jšõ¼Îp<¿“¼²$î¹šâ9;–`