From 69bd34f2f6b6029495050aa5fc490df9626ec466 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Tue, 7 Feb 2023 11:57:26 +0300 Subject: [PATCH] [#1] Update env prefixes in builds Signed-off-by: Alex Vanin --- .env | 4 +- services/ir/.ir.env | 4 +- services/ir/healthcheck.sh | 2 +- services/storage/docker-compose.yml | 66 ++++++++++++++--------------- services/storage/healthcheck.sh | 2 +- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.env b/.env index 5b35d5a..c7955fc 100644 --- a/.env +++ b/.env @@ -12,11 +12,11 @@ NEOGO_VERSION=0.99.4 NEOGO_IMAGE=nspccdev/neo-go # FrostFS InnerRing nodes -IR_VERSION=d4d2a8c8 +IR_VERSION=5ffa8268 IR_IMAGE=truecloudlab/frostfs-ir # FrostFS Storage nodes -NODE_VERSION=d4d2a8c8 +NODE_VERSION=5ffa8268 NODE_IMAGE=truecloudlab/frostfs-storage # NATS Server diff --git a/services/ir/.ir.env b/services/ir/.ir.env index ce4e331..33df607 100644 --- a/services/ir/.ir.env +++ b/services/ir/.ir.env @@ -1,3 +1,3 @@ -NEOFS_IR_CONTRACTS_FROSTFSID=1943e9bb78a0fe2fe0c95fd2677eec2da6aa4aa5 +FROSTFS_IR_CONTRACTS_FROSTFSID=1943e9bb78a0fe2fe0c95fd2677eec2da6aa4aa5 -NEOFS_IR_CONTROL_GRPC_ENDPOINT=127.0.0.1:16512 +FROSTFS_IR_CONTROL_GRPC_ENDPOINT=127.0.0.1:16512 diff --git a/services/ir/healthcheck.sh b/services/ir/healthcheck.sh index 6e8ac3f..747bc8b 100755 --- a/services/ir/healthcheck.sh +++ b/services/ir/healthcheck.sh @@ -1,6 +1,6 @@ #!/bin/sh /frostfs-cli control healthcheck \ - --endpoint "$NEOFS_IR_CONTROL_GRPC_ENDPOINT" \ + --endpoint "$FROSTFS_IR_CONTROL_GRPC_ENDPOINT" \ --wallet /wallet01.key --ir | grep "Health status: READY" diff --git a/services/storage/docker-compose.yml b/services/storage/docker-compose.yml index 27eceb7..b32ba21 100644 --- a/services/storage/docker-compose.yml +++ b/services/storage/docker-compose.yml @@ -28,13 +28,13 @@ services: env_file: [ ".env", ".storage.env", ".int_test.env" ] command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ] environment: - - NEOFS_NODE_WALLET_PATH=./wallet.json - - NEOFS_NODE_WALLET_PASSWORD= - - 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_1=UN-LOCODE:RU MOW - - NEOFS_NODE_ATTRIBUTE_2=Price:22 + - FROSTFS_NODE_WALLET_PATH=./wallet.json + - FROSTFS_NODE_WALLET_PASSWORD= + - FROSTFS_NODE_ADDRESSES=s01.${LOCAL_DOMAIN}:8080 + - FROSTFS_GRPC_0_ENDPOINT=s01.${LOCAL_DOMAIN}:8080 + - FROSTFS_CONTROL_GRPC_ENDPOINT=s01.${LOCAL_DOMAIN}:8081 + - FROSTFS_NODE_ATTRIBUTE_1=UN-LOCODE:RU MOW + - FROSTFS_NODE_ATTRIBUTE_2=Price:22 healthcheck: test: ["CMD-SHELL", "/healthcheck.sh"] interval: 2s @@ -68,13 +68,13 @@ services: env_file: [ ".env", ".storage.env", ".int_test.env" ] command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ] environment: - - NEOFS_NODE_WALLET_PATH=./wallet.json - - NEOFS_NODE_WALLET_PASSWORD= - - 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_1=UN-LOCODE:RU LED - - NEOFS_NODE_ATTRIBUTE_2=Price:33 + - FROSTFS_NODE_WALLET_PATH=./wallet.json + - FROSTFS_NODE_WALLET_PASSWORD= + - FROSTFS_NODE_ADDRESSES=s02.${LOCAL_DOMAIN}:8080 + - FROSTFS_GRPC_0_ENDPOINT=s02.${LOCAL_DOMAIN}:8080 + - FROSTFS_CONTROL_GRPC_ENDPOINT=s02.${LOCAL_DOMAIN}:8081 + - FROSTFS_NODE_ATTRIBUTE_1=UN-LOCODE:RU LED + - FROSTFS_NODE_ATTRIBUTE_2=Price:33 healthcheck: test: ["CMD-SHELL", "/healthcheck.sh"] interval: 2s @@ -108,13 +108,13 @@ services: env_file: [ ".env", ".storage.env", ".int_test.env" ] command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ] environment: - - NEOFS_NODE_WALLET_PATH=./wallet.json - - NEOFS_NODE_WALLET_PASSWORD= - - 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_1=UN-LOCODE:SE STO - - NEOFS_NODE_ATTRIBUTE_2=Price:11 + - FROSTFS_NODE_WALLET_PATH=./wallet.json + - FROSTFS_NODE_WALLET_PASSWORD= + - FROSTFS_NODE_ADDRESSES=s03.${LOCAL_DOMAIN}:8080 + - FROSTFS_GRPC_0_ENDPOINT=s03.${LOCAL_DOMAIN}:8080 + - FROSTFS_CONTROL_GRPC_ENDPOINT=s03.${LOCAL_DOMAIN}:8081 + - FROSTFS_NODE_ATTRIBUTE_1=UN-LOCODE:SE STO + - FROSTFS_NODE_ATTRIBUTE_2=Price:11 healthcheck: test: ["CMD-SHELL", "/healthcheck.sh"] interval: 2s @@ -149,18 +149,18 @@ services: env_file: [ ".env", ".storage.env", ".int_test.env" ] command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ] environment: - - NEOFS_NODE_WALLET_PATH=./wallet.json - - NEOFS_NODE_WALLET_PASSWORD= - - NEOFS_NODE_ADDRESSES=s04.${LOCAL_DOMAIN}:8080 grpcs://s04.${LOCAL_DOMAIN}:8082 - - NEOFS_CONTROL_GRPC_ENDPOINT=s04.${LOCAL_DOMAIN}:8081 - - NEOFS_GRPC_NUM=2 - - NEOFS_GRPC_0_ENDPOINT=s04.${LOCAL_DOMAIN}:8080 - - NEOFS_GRPC_1_ENDPOINT=s04.${LOCAL_DOMAIN}:8082 - - NEOFS_GRPC_1_TLS_ENABLED=true - - NEOFS_GRPC_1_TLS_CERTIFICATE=/tls.crt - - NEOFS_GRPC_1_TLS_KEY=/tls.key - - NEOFS_NODE_ATTRIBUTE_1=UN-LOCODE:FI HEL - - NEOFS_NODE_ATTRIBUTE_2=Price:44 + - FROSTFS_NODE_WALLET_PATH=./wallet.json + - FROSTFS_NODE_WALLET_PASSWORD= + - FROSTFS_NODE_ADDRESSES=s04.${LOCAL_DOMAIN}:8080 grpcs://s04.${LOCAL_DOMAIN}:8082 + - FROSTFS_CONTROL_GRPC_ENDPOINT=s04.${LOCAL_DOMAIN}:8081 + - FROSTFS_GRPC_NUM=2 + - FROSTFS_GRPC_0_ENDPOINT=s04.${LOCAL_DOMAIN}:8080 + - FROSTFS_GRPC_1_ENDPOINT=s04.${LOCAL_DOMAIN}:8082 + - FROSTFS_GRPC_1_TLS_ENABLED=true + - FROSTFS_GRPC_1_TLS_CERTIFICATE=/tls.crt + - FROSTFS_GRPC_1_TLS_KEY=/tls.key + - FROSTFS_NODE_ATTRIBUTE_1=UN-LOCODE:FI HEL + - FROSTFS_NODE_ATTRIBUTE_2=Price:44 healthcheck: test: ["CMD-SHELL", "/healthcheck.sh"] interval: 2s diff --git a/services/storage/healthcheck.sh b/services/storage/healthcheck.sh index bdc5baf..792d2ad 100755 --- a/services/storage/healthcheck.sh +++ b/services/storage/healthcheck.sh @@ -1,5 +1,5 @@ #!/bin/sh /frostfs-cli control healthcheck -c /cli-cfg.yml \ - --endpoint "$NEOFS_CONTROL_GRPC_ENDPOINT" | + --endpoint "$FROSTFS_CONTROL_GRPC_ENDPOINT" | grep "Health status: READY"