dkirillov/frostfs-aio
1
0
Fork 0
forked from TrueCloudLab/frostfs-aio
Code Pull requests Activity

Update to the component master branch

Browse source 
Signed-off-by: Alex Vanin <a.vanin@yadro.com>
This commit is contained in:
Alexey Vanin 2023-07-06 18:48:50 +03:00
parent 5f183d3582
commit e62ff3f0fc
6 changed files with 10 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.env
View file

@ -1,3 +1,3 @@
FROSTFS_HUB_IMAGE=truecloudlab/frostfs FROSTFS_HUB_IMAGE=truecloudlab/frostfs
AIO_IMAGE=truecloudlab/frostfs-aio AIO_IMAGE=truecloudlab/frostfs-aio
AIO_VERSION=1.2.8 AIO_VERSION=1.3.0-preview.1

8
Dockerfile
View file

@ -1,8 +1,8 @@
ARG FROSTFS_HUB_IMAGE=truecloudlab/frostfs ARG FROSTFS_HUB_IMAGE=truecloudlab/frostfs
ARG NEOGO_HUB_IMAGE=nspccdev/neo-go ARG NEOGO_HUB_IMAGE=nspccdev/neo-go
ARG FROSTFS_CORE_TAG=0.36.0 ARG FROSTFS_CORE_TAG=6eefe974
ARG FROSTFS_GATES_TAG=0.27.0 ARG FROSTFS_GATES_TAG=0.27.0-rc.2
ARG NEOGO_TAG=0.101.1 ARG NEOGO_TAG=0.101.1
FROM ${NEOGO_HUB_IMAGE}:${NEOGO_TAG} as neo-go FROM ${NEOGO_HUB_IMAGE}:${NEOGO_TAG} as neo-go
@ -10,8 +10,8 @@ FROM ${FROSTFS_HUB_IMAGE}-adm:${FROSTFS_CORE_TAG} as frostfs-adm
FROM ${FROSTFS_HUB_IMAGE}-cli:${FROSTFS_CORE_TAG} as frostfs-cli FROM ${FROSTFS_HUB_IMAGE}-cli:${FROSTFS_CORE_TAG} as frostfs-cli
FROM ${FROSTFS_HUB_IMAGE}-ir:${FROSTFS_CORE_TAG} as frostfs-ir FROM ${FROSTFS_HUB_IMAGE}-ir:${FROSTFS_CORE_TAG} as frostfs-ir
FROM ${FROSTFS_HUB_IMAGE}-storage:${FROSTFS_CORE_TAG} as frostfs-storage FROM ${FROSTFS_HUB_IMAGE}-storage:${FROSTFS_CORE_TAG} as frostfs-storage
FROM ${FROSTFS_HUB_IMAGE}-s3-gw:${FROSTFS_GATES_TAG} as frostfs-s3-gw FROM ${FROSTFS_HUB_IMAGE}-s3-gw:0.27.0-rc.1-74-g7f708b3a as frostfs-s3-gw
FROM ${FROSTFS_HUB_IMAGE}-http-gw:${FROSTFS_GATES_TAG} as frostfs-http-gw FROM ${FROSTFS_HUB_IMAGE}-http-gw:0.27.0-rc.1-32-g6f64557a as frostfs-http-gw
# Executable image # Executable image
FROM alpine AS frostfs-aio FROM alpine AS frostfs-aio

16
Makefile
View file

@ -8,11 +8,6 @@ REPO=$(notdir $(shell pwd))
VERSION ?= "$(shell git describe --tags --match "v*" 2>/dev/null || git rev-parse --short HEAD | sed 's/^v//')" VERSION ?= "$(shell git describe --tags --match "v*" 2>/dev/null || git rev-parse --short HEAD | sed 's/^v//')"
# Variables for docker # Variables for docker
NEOGO_HUB_IMAGE ?= "nspccdev/neo-go"
NEOGO_HUB_TAG ?= "0.101.1"
FROSTFS_HUB_IMAGE ?= "truecloudlab/frostfs"
FROSTFS_CORE_TAG ?= "0.36.0"
FROSTFS_GATES_TAG ?= "0.27.0"
AIO_IMAGE ?= "truecloudlab/frostfs-aio" AIO_IMAGE ?= "truecloudlab/frostfs-aio"
# Variables for compose # Variables for compose
@ -34,11 +29,6 @@ image-aio:
@echo "⇒ Build aio docker image" @echo "⇒ Build aio docker image"
@docker build \ @docker build \
--rm \ --rm \
--build-arg FROSTFS_HUB_IMAGE=$(FROSTFS_HUB_IMAGE) \
--build-arg FROSTFS_CORE_TAG=$(FROSTFS_CORE_TAG) \
--build-arg FROSTFS_GATES_TAG=$(FROSTFS_GATES_TAG) \
--build-arg NEOGO_HUB_IMAGE=$(NEOGO_HUB_IMAGE) \
--build-arg NEOGO_TAG=$(NEOGO_HUB_TAG) \
-f Dockerfile \ -f Dockerfile \
-t $(AIO_IMAGE):$(AIO_VERSION) . -t $(AIO_IMAGE):$(AIO_VERSION) .
@ -68,8 +58,7 @@ s3cred:
--wallet /config/user-wallet.json \ --wallet /config/user-wallet.json \
--peer localhost:8080 \ --peer localhost:8080 \
--gate-public-key $(S3_GATE_PUBLIC_KEY) \ --gate-public-key $(S3_GATE_PUBLIC_KEY) \
--container-placement-policy "REP 1" \ --container-placement-policy "REP 1"
--bearer-rules $(S3_BEARER_RULES)
# Generate S3 credentials based on imported wallets # Generate S3 credentials based on imported wallets
s3cred-custom: s3cred-custom:
@ -77,8 +66,7 @@ s3cred-custom:
--wallet /wallets/$(wallet) \ --wallet /wallets/$(wallet) \
--peer localhost:8080 \ --peer localhost:8080 \
--gate-public-key $(S3_GATE_PUBLIC_KEY) \ --gate-public-key $(S3_GATE_PUBLIC_KEY) \
--container-placement-policy "REP 1" \ --container-placement-policy "REP 1"
--bearer-rules $(S3_BEARER_RULES)
# Tick new epoch in side chain # Tick new epoch in side chain
tick.epoch: tick.epoch:

2
http-gw/http-gw-config.yaml
View file

@ -29,7 +29,7 @@ wallet:
peers: peers:
0: 0:
address: grpc://localhost:8080 address: localhost:8080
priority: 1 priority: 1
weight: 1 weight: 1

3
s3-gw/s3-gw-config.yaml
View file

@ -15,9 +15,6 @@ server:
logger: logger:
level: debug level: debug
tree:
service: localhost:8080
rpc_endpoint: http://localhost:30333 rpc_endpoint: http://localhost:30333
resolve_order: resolve_order:
- nns - nns

2
sn/config.yaml
View file

@ -62,6 +62,8 @@ storage:
tree: tree:
enabled: true enabled: true
allowed_keys:
- 0324e76288fcb900100d01802a14ef977cca45ad073561230446df14b344c858b6
object: object:
put: put: