Compare commits

..

No commits in common. "master" and "master" have entirely different histories.

14 changed files with 27 additions and 27 deletions

14
.env
View File

@ -12,11 +12,11 @@ NEOGO_VERSION=0.104.0
NEOGO_IMAGE=nspccdev/neo-go
# FrostFS InnerRing nodes
IR_VERSION=0.38.5
IR_VERSION=0.37.0-rc.1-164-gbdd43f62
IR_IMAGE=truecloudlab/frostfs-ir
# FrostFS Storage nodes
NODE_VERSION=0.38.5
NODE_VERSION=0.37.0-rc.1-164-gbdd43f62
NODE_IMAGE=truecloudlab/frostfs-storage
# NATS Server
@ -40,17 +40,17 @@ LOCODE_DB_URL=https://git.frostfs.info/attachments/a2e8def7-52b6-49f1-89cd-a0567
#LOCODE_DB_PATH=/path/to/locode_db
# FrostFS CLI binary
FROSTFS_CLI_URL=https://http.t5.fs.neo.org/7sm9csjtRLpr4c9QD55q9JJM73v79ohuAhTzP4fYRHFz/BtA6zWLtoDuDnzxSNkKPjyN5hGuSZFxGuJD1gh8kBwkP
FROSTFS_CLI_URL=https://http.t5.fs.neo.org/7sm9csjtRLpr4c9QD55q9JJM73v79ohuAhTzP4fYRHFz/HUu3vMojqiopmAzWgUPPPSN7ThosapsLj5WrBvZR67tC
#FROSTFS_CLI_PATH=/path/to/frostfs-cli-binary
# FrostFS ADM tool binary
FROSTFS_ADM_VERSION=498f9955ea
FROSTFS_ADM_URL=https://http.t5.fs.neo.org/7sm9csjtRLpr4c9QD55q9JJM73v79ohuAhTzP4fYRHFz/CjV4S6ENzo2FLK4KxXZHHNW4veR1ATtynGY6Mc1xQ6RB
FROSTFS_ADM_VERSION=eca5c210
FROSTFS_ADM_URL=https://http.t5.fs.neo.org/7sm9csjtRLpr4c9QD55q9JJM73v79ohuAhTzP4fYRHFz/NMw4AktoK2zo5Kftj23wGEVzE1d52ULufjtcLjAVqZc
#FROSTFS_ADM_PATH=/path/to/frostfs-adm-binary
# Compiled FrostFS Smart Contracts
FROSTFS_CONTRACTS_VERSION=694daebb19
FROSTFS_CONTRACTS_URL=https://git.frostfs.info/TrueCloudLab/frostfs-contract/releases/download/v0.19.2/frostfs-contract-v0.19.2.tar.gz
FROSTFS_CONTRACTS_VERSION=8537293e
FROSTFS_CONTRACTS_URL=https://http.t5.fs.neo.org/7sm9csjtRLpr4c9QD55q9JJM73v79ohuAhTzP4fYRHFz/BLG2NrQW5UAF1RSMSBK8Z4mGanhvzD9aTRk4NsRGVDV9
#FROSTFS_CONTRACTS_PATH=/path/to/unpacked/frostfs-contracts-dir
# Jaeger tracing

View File

@ -76,10 +76,6 @@ up/bootstrap: get vendor/hosts
@$(foreach SVC, $(START_BOOTSTRAP), $(shell docker-compose -f services/$(SVC)/docker-compose.yml up -d))
@source ./bin/helper.sh
@./vendor/frostfs-adm --config frostfs-adm.yml morph init --contracts vendor/contracts
echo "Set rule chain to policy contract"
@./vendor/frostfs-adm --config frostfs-adm.yml morph \
ape add-rule-chain --target-type namespace --target-name "" \
--rule 'allow Container.* *' --chain-id "allow_container_ops"
@for f in ./services/storage/wallet*.json; do \
echo "Transfer GAS to wallet $${f}" \
&& ./vendor/frostfs-adm -c frostfs-adm.yml morph refill-gas --storage-wallet $${f} --gas 10.0 \

View File

@ -1,5 +1,6 @@
---
version: "2.4"
services:
basenet:

View File

@ -1,3 +1,4 @@
version: '2.4'
services:
grafana:
image: ${GRAFANA_IMAGE}:${GRAFANA_VERSION}

View File

@ -1,5 +1,6 @@
---
version: "2.4"
services:
http_gate:
image: ${HTTP_GW_IMAGE}:${HTTP_GW_VERSION}

View File

@ -1,5 +1,6 @@
---
version: "2.4"
services:
ir01:
@ -12,8 +13,7 @@ services:
ir_int:
internet:
ipv4_address: ${IPV4_PREFIX}.61
stop_signal: SIGTERM
stop_grace_period: 15s
stop_signal: SIGKILL
volumes:
- ./az.json:/wallet.json
- ./az.key:/wallet01.key

View File

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

View File

@ -1,3 +1,4 @@
version: '2.4'
services:
jaeger:
image: ${JAEGER_IMAGE}:${JAEGER_VERSION}

View File

@ -1,5 +1,6 @@
---
version: "2.4"
services:
frostfs_morph_chain:
image: ${NEOGO_IMAGE}:${NEOGO_VERSION}

View File

@ -1,5 +1,6 @@
---
version: "2.4"
services:
nats:
image: ${NATS_IMAGE}:${NATS_VERSION}

View File

@ -1,3 +1,4 @@
version: '2.4'
services:
prometheus:
image: ${PROMETHEUS_IMAGE}:${PROMETHEUS_VERSION}

View File

@ -1,5 +1,6 @@
---
version: "2.4"
services:
rest_gate:
image: ${REST_GW_IMAGE}:${REST_GW_VERSION}
@ -15,8 +16,7 @@ services:
- ./wallet.json:/wallet.json
- ./../../vendor/hosts:/etc/hosts
- ./cfg:/etc/frostfs/rest
stop_signal: SIGTERM
stop_grace_period: 15s
stop_signal: SIGKILL
env_file: [ ".env", ".int_test.env" ]
command: [ "frostfs-rest-gw", "--config", "/etc/frostfs/rest/config.yml" ]
environment:

View File

@ -1,5 +1,6 @@
---
version: "2.4"
services:
s3_gate:
image: ${S3_GW_IMAGE}:${S3_GW_VERSION}
@ -17,8 +18,7 @@ services:
- ./tls.crt:/tls.crt
- ./../../vendor/hosts:/etc/hosts
- ./cfg:/etc/frostfs/s3
stop_signal: SIGTERM
stop_grace_period: 15s
stop_signal: SIGKILL
env_file: [ ".env", ".s3.env", ".int_test.env" ]
command: [ "frostfs-s3-gw", "--config", "/etc/frostfs/s3/config.yml" ]
environment:

View File

@ -1,5 +1,6 @@
---
version: "2.4"
services:
storage01:
image: ${NODE_IMAGE}:${NODE_VERSION}
@ -23,8 +24,7 @@ services:
- ../nats/client-key.pem:/etc/frostfs-node/nats.tls.key
- ../nats/ca-cert.pem:/etc/frostfs-node/nats.ca.crt
- ./cfg:/etc/frostfs/storage
stop_signal: SIGTERM
stop_grace_period: 15s
stop_signal: SIGKILL
env_file: [ ".env", ".storage.env", ".int_test.env" ]
command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ]
environment:
@ -64,8 +64,7 @@ services:
- ../nats/client-key.pem:/etc/frostfs-node/nats.tls.key
- ../nats/ca-cert.pem:/etc/frostfs-node/nats.ca.crt
- ./cfg:/etc/frostfs/storage
stop_signal: SIGTERM
stop_grace_period: 15s
stop_signal: SIGKILL
env_file: [ ".env", ".storage.env", ".int_test.env" ]
command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ]
environment:
@ -105,8 +104,7 @@ services:
- ../nats/client-key.pem:/etc/frostfs-node/nats.tls.key
- ../nats/ca-cert.pem:/etc/frostfs-node/nats.ca.crt
- ./cfg:/etc/frostfs/storage
stop_signal: SIGTERM
stop_grace_period: 15s
stop_signal: SIGKILL
env_file: [ ".env", ".storage.env", ".int_test.env" ]
command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ]
environment:
@ -147,8 +145,7 @@ services:
- ../nats/client-key.pem:/etc/frostfs-node/nats.tls.key
- ../nats/ca-cert.pem:/etc/frostfs-node/nats.ca.crt
- ./cfg:/etc/frostfs/storage
stop_signal: SIGTERM
stop_grace_period: 15s
stop_signal: SIGKILL
env_file: [ ".env", ".storage.env", ".int_test.env" ]
command: [ "frostfs-node", "--config", "/etc/frostfs/storage/config.yml" ]
environment: