Compare commits

...

1 commit

5 changed files with 10 additions and 12 deletions

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.7 AIO_VERSION=1.2.7-1

View file

@ -10,7 +10,7 @@ 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 nspccdev/neofs-s3-gw:0.21.1 as neofs-s3-gw
FROM ${FROSTFS_HUB_IMAGE}-http-gw:${FROSTFS_GATES_TAG} as frostfs-http-gw FROM ${FROSTFS_HUB_IMAGE}-http-gw:${FROSTFS_GATES_TAG} as frostfs-http-gw
# Executable image # Executable image
@ -32,8 +32,8 @@ COPY --from=frostfs-adm /bin/frostfs-adm /usr/bin/frostfs-adm
COPY --from=frostfs-cli /bin/frostfs-cli /usr/bin/frostfs-cli COPY --from=frostfs-cli /bin/frostfs-cli /usr/bin/frostfs-cli
COPY --from=frostfs-ir /bin/frostfs-ir /usr/bin/frostfs-ir COPY --from=frostfs-ir /bin/frostfs-ir /usr/bin/frostfs-ir
COPY --from=frostfs-storage /bin/frostfs-node /usr/bin/frostfs-node COPY --from=frostfs-storage /bin/frostfs-node /usr/bin/frostfs-node
COPY --from=frostfs-s3-gw /bin/frostfs-s3-gw /usr/bin/frostfs-s3-gw COPY --from=neofs-s3-gw /bin/neofs-s3-gw /usr/bin/neofs-s3-gw
COPY --from=frostfs-s3-gw /bin/frostfs-s3-authmate /usr/bin/frostfs-s3-authmate COPY --from=neofs-s3-gw /bin/neofs-authmate /usr/bin/neofs-authmate
COPY --from=frostfs-http-gw /bin/frostfs-http-gw /usr/bin/frostfs-http-gw COPY --from=frostfs-http-gw /bin/frostfs-http-gw /usr/bin/frostfs-http-gw
COPY ./adm/frostfs-adm.yml /config/frostfs-adm.yml COPY ./adm/frostfs-adm.yml /config/frostfs-adm.yml

View file

@ -53,7 +53,7 @@ clean:
# Generate S3 credentials # Generate S3 credentials
s3cred: s3cred:
@docker exec aio /usr/bin/frostfs-s3-authmate issue-secret \ @docker exec aio /usr/bin/neofs-authmate issue-secret \
--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) \

View file

@ -54,7 +54,7 @@ runServices() {
sleep 2 sleep 2
done done
/usr/bin/frostfs-s3-gw --config /config/s3-gw-config.yaml & /usr/bin/neofs-s3-gw --config /config/s3-gw-config.yaml --wallet /config/s3-gw-wallet.json &
/usr/bin/frostfs-http-gw --config /config/http-gw-config.yaml & /usr/bin/frostfs-http-gw --config /config/http-gw-config.yaml &
} }

View file

@ -1,6 +1,6 @@
wallet: wallet:
path: /config/s3-gw-wallet.json
passphrase: "" passphrase: ""
address: NN1RQ3qwnvDMVNsQw4WPkKi7BrjxdVTDZp address: NN1RQ3qwnvDMVNsQw4WPkKi7BrjxdVTDZp
peers: peers:
@ -9,8 +9,7 @@ peers:
priority: 1 priority: 1
weight: 1 weight: 1
server: listen_address: 0.0.0.0:8084
- address: 0.0.0.0:8084
logger: logger:
level: debug level: debug
@ -61,7 +60,6 @@ cache:
lifetime: 1m lifetime: 1m
size: 100000 size: 100000
placement_policy: default_policy: REP 1
default: REP 1