diff --git a/.env b/.env index dcf003b..b2ecf86 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ FROSTFS_HUB_IMAGE=truecloudlab/frostfs AIO_IMAGE=truecloudlab/frostfs-aio -AIO_VERSION=1.2.7 +AIO_VERSION=1.3.0-preview.1 diff --git a/Dockerfile b/Dockerfile index 7d5e013..8a3e407 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FROSTFS_HUB_IMAGE=truecloudlab/frostfs ARG NEOGO_HUB_IMAGE=nspccdev/neo-go -ARG FROSTFS_CORE_TAG=0beb7ccf +ARG FROSTFS_CORE_TAG=6eefe974 ARG FROSTFS_GATES_TAG=0.27.0-rc.2 ARG NEOGO_TAG=0.101.1 @@ -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}-ir:${FROSTFS_CORE_TAG} as frostfs-ir 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}-http-gw:${FROSTFS_GATES_TAG} as frostfs-http-gw +FROM ${FROSTFS_HUB_IMAGE}-s3-gw:0.27.0-rc.1-74-g7f708b3a as frostfs-s3-gw +FROM ${FROSTFS_HUB_IMAGE}-http-gw:0.27.0-rc.1-32-g6f64557a as frostfs-http-gw # Executable image FROM alpine AS frostfs-aio diff --git a/Makefile b/Makefile index 1144bac..bbc6b27 100644 --- a/Makefile +++ b/Makefile @@ -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//')" # Variables for docker -NEOGO_HUB_IMAGE ?= "nspccdev/neo-go" -NEOGO_HUB_TAG ?= "0.101.1" -FROSTFS_HUB_IMAGE ?= "truecloudlab/frostfs" -FROSTFS_CORE_TAG ?= "0beb7ccf" -FROSTFS_GATES_TAG ?= "0.27.0-rc.2" AIO_IMAGE ?= "truecloudlab/frostfs-aio" # Variables for compose @@ -31,11 +26,6 @@ image-aio: @echo "⇒ Build aio docker image " @docker build \ --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 \ -t $(AIO_IMAGE):$(AIO_VERSION) . @@ -57,8 +47,7 @@ s3cred: --wallet /config/user-wallet.json \ --peer localhost:8080 \ --gate-public-key $(S3_GATE_PUBLIC_KEY) \ - --container-placement-policy "REP 1" \ - --bearer-rules $(S3_BEARER_RULES) + --container-placement-policy "REP 1" # Tick new epoch in side chain tick.epoch: diff --git a/http-gw/http-gw-config.yaml b/http-gw/http-gw-config.yaml index 105236b..c11a43a 100644 --- a/http-gw/http-gw-config.yaml +++ b/http-gw/http-gw-config.yaml @@ -29,7 +29,7 @@ wallet: peers: 0: - address: grpc://localhost:8080 + address: localhost:8080 priority: 1 weight: 1 diff --git a/s3-gw/s3-gw-config.yaml b/s3-gw/s3-gw-config.yaml index 522e1b4..73721f5 100644 --- a/s3-gw/s3-gw-config.yaml +++ b/s3-gw/s3-gw-config.yaml @@ -15,9 +15,6 @@ server: logger: level: debug -tree: - service: localhost:8080 - rpc_endpoint: http://localhost:30333 resolve_order: - nns diff --git a/sn/config.yaml b/sn/config.yaml index f8d4dd1..9768acb 100644 --- a/sn/config.yaml +++ b/sn/config.yaml @@ -62,6 +62,8 @@ storage: tree: enabled: true + allowed_keys: + - 0324e76288fcb900100d01802a14ef977cca45ad073561230446df14b344c858b6 object: put: