dstepanov-yadro/frostfs-dev-env
1
0
Fork 0
forked from TrueCloudLab/frostfs-dev-env
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1] Update env prefixes in builds

Browse source 
Signed-off-by: Alex Vanin <a.vanin@yadro.com>
This commit is contained in:
Alexey Vanin 2023-02-07 11:57:26 +03:00 committed by Stanislav Bogatyrev
parent 9645cf7793
commit 69bd34f2f6
5 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.env
View file

@ -12,11 +12,11 @@ NEOGO_VERSION=0.99.4
NEOGO_IMAGE=nspccdev/neo-go NEOGO_IMAGE=nspccdev/neo-go
# FrostFS InnerRing nodes # FrostFS InnerRing nodes
IR_VERSION=d4d2a8c8 IR_VERSION=5ffa8268
IR_IMAGE=truecloudlab/frostfs-ir IR_IMAGE=truecloudlab/frostfs-ir
# FrostFS Storage nodes # FrostFS Storage nodes
NODE_VERSION=d4d2a8c8 NODE_VERSION=5ffa8268
NODE_IMAGE=truecloudlab/frostfs-storage NODE_IMAGE=truecloudlab/frostfs-storage
# NATS Server # NATS Server

4
services/ir/.ir.env
View file

@ -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

2
services/ir/healthcheck.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
/frostfs-cli control healthcheck \ /frostfs-cli control healthcheck \
--endpoint "$NEOFS_IR_CONTROL_GRPC_ENDPOINT" \ --endpoint "$FROSTFS_IR_CONTROL_GRPC_ENDPOINT" \
--wallet /wallet01.key --ir | --wallet /wallet01.key --ir |
grep "Health status: READY" grep "Health status: READY"

66
services/storage/docker-compose.yml
View file

@ -28,13 +28,13 @@ services:
env_file: [ ".env", ".storage.env", ".int_test.env" ] env_file: [ ".env", ".storage.env", ".int_test.env" ]
command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ] command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ]
environment: environment:
- NEOFS_NODE_WALLET_PATH=./wallet.json - FROSTFS_NODE_WALLET_PATH=./wallet.json
- NEOFS_NODE_WALLET_PASSWORD= - FROSTFS_NODE_WALLET_PASSWORD=
- NEOFS_NODE_ADDRESSES=s01.${LOCAL_DOMAIN}:8080 - FROSTFS_NODE_ADDRESSES=s01.${LOCAL_DOMAIN}:8080
- NEOFS_GRPC_0_ENDPOINT=s01.${LOCAL_DOMAIN}:8080 - FROSTFS_GRPC_0_ENDPOINT=s01.${LOCAL_DOMAIN}:8080
- NEOFS_CONTROL_GRPC_ENDPOINT=s01.${LOCAL_DOMAIN}:8081 - FROSTFS_CONTROL_GRPC_ENDPOINT=s01.${LOCAL_DOMAIN}:8081
- NEOFS_NODE_ATTRIBUTE_1=UN-LOCODE:RU MOW - FROSTFS_NODE_ATTRIBUTE_1=UN-LOCODE:RU MOW
- NEOFS_NODE_ATTRIBUTE_2=Price:22 - FROSTFS_NODE_ATTRIBUTE_2=Price:22
healthcheck: healthcheck:
test: ["CMD-SHELL", "/healthcheck.sh"] test: ["CMD-SHELL", "/healthcheck.sh"]
interval: 2s interval: 2s
@ -68,13 +68,13 @@ services:
env_file: [ ".env", ".storage.env", ".int_test.env" ] env_file: [ ".env", ".storage.env", ".int_test.env" ]
command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ] command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ]
environment: environment:
- NEOFS_NODE_WALLET_PATH=./wallet.json - FROSTFS_NODE_WALLET_PATH=./wallet.json
- NEOFS_NODE_WALLET_PASSWORD= - FROSTFS_NODE_WALLET_PASSWORD=
- NEOFS_NODE_ADDRESSES=s02.${LOCAL_DOMAIN}:8080 - FROSTFS_NODE_ADDRESSES=s02.${LOCAL_DOMAIN}:8080
- NEOFS_GRPC_0_ENDPOINT=s02.${LOCAL_DOMAIN}:8080 - FROSTFS_GRPC_0_ENDPOINT=s02.${LOCAL_DOMAIN}:8080
- NEOFS_CONTROL_GRPC_ENDPOINT=s02.${LOCAL_DOMAIN}:8081 - FROSTFS_CONTROL_GRPC_ENDPOINT=s02.${LOCAL_DOMAIN}:8081
- NEOFS_NODE_ATTRIBUTE_1=UN-LOCODE:RU LED - FROSTFS_NODE_ATTRIBUTE_1=UN-LOCODE:RU LED
- NEOFS_NODE_ATTRIBUTE_2=Price:33 - FROSTFS_NODE_ATTRIBUTE_2=Price:33
healthcheck: healthcheck:
test: ["CMD-SHELL", "/healthcheck.sh"] test: ["CMD-SHELL", "/healthcheck.sh"]
interval: 2s interval: 2s
@ -108,13 +108,13 @@ services:
env_file: [ ".env", ".storage.env", ".int_test.env" ] env_file: [ ".env", ".storage.env", ".int_test.env" ]
command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ] command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ]
environment: environment:
- NEOFS_NODE_WALLET_PATH=./wallet.json - FROSTFS_NODE_WALLET_PATH=./wallet.json
- NEOFS_NODE_WALLET_PASSWORD= - FROSTFS_NODE_WALLET_PASSWORD=
- NEOFS_NODE_ADDRESSES=s03.${LOCAL_DOMAIN}:8080 - FROSTFS_NODE_ADDRESSES=s03.${LOCAL_DOMAIN}:8080
- NEOFS_GRPC_0_ENDPOINT=s03.${LOCAL_DOMAIN}:8080 - FROSTFS_GRPC_0_ENDPOINT=s03.${LOCAL_DOMAIN}:8080
- NEOFS_CONTROL_GRPC_ENDPOINT=s03.${LOCAL_DOMAIN}:8081 - FROSTFS_CONTROL_GRPC_ENDPOINT=s03.${LOCAL_DOMAIN}:8081
- NEOFS_NODE_ATTRIBUTE_1=UN-LOCODE:SE STO - FROSTFS_NODE_ATTRIBUTE_1=UN-LOCODE:SE STO
- NEOFS_NODE_ATTRIBUTE_2=Price:11 - FROSTFS_NODE_ATTRIBUTE_2=Price:11
healthcheck: healthcheck:
test: ["CMD-SHELL", "/healthcheck.sh"] test: ["CMD-SHELL", "/healthcheck.sh"]
interval: 2s interval: 2s
@ -149,18 +149,18 @@ services:
env_file: [ ".env", ".storage.env", ".int_test.env" ] env_file: [ ".env", ".storage.env", ".int_test.env" ]
command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ] command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ]
environment: environment:
- NEOFS_NODE_WALLET_PATH=./wallet.json - FROSTFS_NODE_WALLET_PATH=./wallet.json
- NEOFS_NODE_WALLET_PASSWORD= - FROSTFS_NODE_WALLET_PASSWORD=
- NEOFS_NODE_ADDRESSES=s04.${LOCAL_DOMAIN}:8080 grpcs://s04.${LOCAL_DOMAIN}:8082 - FROSTFS_NODE_ADDRESSES=s04.${LOCAL_DOMAIN}:8080 grpcs://s04.${LOCAL_DOMAIN}:8082
- NEOFS_CONTROL_GRPC_ENDPOINT=s04.${LOCAL_DOMAIN}:8081 - FROSTFS_CONTROL_GRPC_ENDPOINT=s04.${LOCAL_DOMAIN}:8081
- NEOFS_GRPC_NUM=2 - FROSTFS_GRPC_NUM=2
- NEOFS_GRPC_0_ENDPOINT=s04.${LOCAL_DOMAIN}:8080 - FROSTFS_GRPC_0_ENDPOINT=s04.${LOCAL_DOMAIN}:8080
- NEOFS_GRPC_1_ENDPOINT=s04.${LOCAL_DOMAIN}:8082 - FROSTFS_GRPC_1_ENDPOINT=s04.${LOCAL_DOMAIN}:8082
- NEOFS_GRPC_1_TLS_ENABLED=true - FROSTFS_GRPC_1_TLS_ENABLED=true
- NEOFS_GRPC_1_TLS_CERTIFICATE=/tls.crt - FROSTFS_GRPC_1_TLS_CERTIFICATE=/tls.crt
- NEOFS_GRPC_1_TLS_KEY=/tls.key - FROSTFS_GRPC_1_TLS_KEY=/tls.key
- NEOFS_NODE_ATTRIBUTE_1=UN-LOCODE:FI HEL - FROSTFS_NODE_ATTRIBUTE_1=UN-LOCODE:FI HEL
- NEOFS_NODE_ATTRIBUTE_2=Price:44 - FROSTFS_NODE_ATTRIBUTE_2=Price:44
healthcheck: healthcheck:
test: ["CMD-SHELL", "/healthcheck.sh"] test: ["CMD-SHELL", "/healthcheck.sh"]
interval: 2s interval: 2s

2
services/storage/healthcheck.sh
View file

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
/frostfs-cli control healthcheck -c /cli-cfg.yml \ /frostfs-cli control healthcheck -c /cli-cfg.yml \
--endpoint "$NEOFS_CONTROL_GRPC_ENDPOINT" | --endpoint "$FROSTFS_CONTROL_GRPC_ENDPOINT" |
grep "Health status: READY" grep "Health status: READY"