Release v1.6.0 #41
22 changed files with 68 additions and 40 deletions
2
.env
2
.env
|
@ -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.5.1
|
AIO_VERSION=1.6.0
|
||||||
|
|
24
Dockerfile
24
Dockerfile
|
@ -1,18 +1,18 @@
|
||||||
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.38.6
|
ARG FROSTFS_CORE_TAG=0.42.12
|
||||||
ARG FROSTFS_HTTP_GATE_TAG=0.29.0
|
ARG FROSTFS_HTTP_GATE_TAG=0.30.2
|
||||||
ARG FROSTFS_S3_GATE_TAG=0.29.0
|
ARG FROSTFS_S3_GATE_TAG=0.30.4
|
||||||
ARG NEOGO_TAG=0.104.0
|
ARG NEOGO_TAG=0.106.0
|
||||||
|
|
||||||
FROM ${NEOGO_HUB_IMAGE}:${NEOGO_TAG} as neo-go
|
FROM ${NEOGO_HUB_IMAGE}:${NEOGO_TAG} AS neo-go
|
||||||
FROM ${FROSTFS_HUB_IMAGE}-adm:${FROSTFS_CORE_TAG} as frostfs-adm
|
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_S3_GATE_TAG} as frostfs-s3-gw
|
FROM ${FROSTFS_HUB_IMAGE}-s3-gw:${FROSTFS_S3_GATE_TAG} AS frostfs-s3-gw
|
||||||
FROM ${FROSTFS_HUB_IMAGE}-http-gw:${FROSTFS_HTTP_GATE_TAG} as frostfs-http-gw
|
FROM ${FROSTFS_HUB_IMAGE}-http-gw:${FROSTFS_HTTP_GATE_TAG} AS frostfs-http-gw
|
||||||
|
|
||||||
# Executable image
|
# Executable image
|
||||||
FROM alpine AS frostfs-aio
|
FROM alpine AS frostfs-aio
|
||||||
|
@ -56,7 +56,9 @@ COPY ./vendor/locode_db /config/locode.db
|
||||||
COPY ./vendor/contracts/ /config/contracts
|
COPY ./vendor/contracts/ /config/contracts
|
||||||
|
|
||||||
COPY ./bin/init-aio.sh /usr/bin/init-aio.sh
|
COPY ./bin/init-aio.sh /usr/bin/init-aio.sh
|
||||||
|
COPY ./bin/issue-creds.sh /usr/bin/issue-creds.sh
|
||||||
|
|
||||||
ENV AUTHMATE_WALLET_PASSPHRASE=""
|
ENV AUTHMATE_WALLET_PASSPHRASE=""
|
||||||
|
ENV AUTHMATE_WALLET_CONTRACT_PASSPHRASE=""
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/bin/init-aio.sh"]
|
ENTRYPOINT ["/usr/bin/init-aio.sh"]
|
||||||
|
|
|
@ -1,18 +1,18 @@
|
||||||
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.38.6
|
ARG FROSTFS_CORE_TAG=0.42.12
|
||||||
ARG FROSTFS_HTTP_GATE_TAG=0.29.0
|
ARG FROSTFS_HTTP_GATE_TAG=0.30.2
|
||||||
ARG FROSTFS_S3_GATE_TAG=0.29.0
|
ARG FROSTFS_S3_GATE_TAG=0.30.4
|
||||||
ARG NEOGO_TAG=0.104.0
|
ARG NEOGO_TAG=0.106.0
|
||||||
|
|
||||||
FROM ${NEOGO_HUB_IMAGE}:${NEOGO_TAG} as neo-go
|
FROM ${NEOGO_HUB_IMAGE}:${NEOGO_TAG} AS neo-go
|
||||||
FROM ${FROSTFS_HUB_IMAGE}-adm:${FROSTFS_CORE_TAG} as frostfs-adm
|
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_S3_GATE_TAG} as frostfs-s3-gw
|
FROM ${FROSTFS_HUB_IMAGE}-s3-gw:${FROSTFS_S3_GATE_TAG} AS frostfs-s3-gw
|
||||||
FROM ${FROSTFS_HUB_IMAGE}-http-gw:${FROSTFS_HTTP_GATE_TAG} as frostfs-http-gw
|
FROM ${FROSTFS_HUB_IMAGE}-http-gw:${FROSTFS_HTTP_GATE_TAG} AS frostfs-http-gw
|
||||||
|
|
||||||
# Executable image
|
# Executable image
|
||||||
FROM alpine AS frostfs-aio
|
FROM alpine AS frostfs-aio
|
||||||
|
@ -58,5 +58,6 @@ COPY ./vendor/contracts/ /config/contracts
|
||||||
COPY ./bin/* /usr/bin/
|
COPY ./bin/* /usr/bin/
|
||||||
|
|
||||||
ENV AUTHMATE_WALLET_PASSPHRASE=""
|
ENV AUTHMATE_WALLET_PASSPHRASE=""
|
||||||
|
ENV AUTHMATE_WALLET_CONTRACT_PASSPHRASE=""
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/bin/init-aio.sh"]
|
ENTRYPOINT ["/usr/bin/init-aio.sh"]
|
||||||
|
|
|
@ -42,5 +42,6 @@ COPY ./vendor/contracts/ /config/contracts
|
||||||
COPY ./bin/init-aio.sh /usr/bin/init-aio.sh
|
COPY ./bin/init-aio.sh /usr/bin/init-aio.sh
|
||||||
|
|
||||||
ENV AUTHMATE_WALLET_PASSPHRASE=""
|
ENV AUTHMATE_WALLET_PASSPHRASE=""
|
||||||
|
ENV AUTHMATE_WALLET_CONTRACT_PASSPHRASE=""
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/bin/init-aio.sh"]
|
ENTRYPOINT ["/usr/bin/init-aio.sh"]
|
||||||
|
|
12
Makefile
12
Makefile
|
@ -63,19 +63,11 @@ clean: down
|
||||||
|
|
||||||
# Generate S3 credentials
|
# Generate S3 credentials
|
||||||
s3cred:
|
s3cred:
|
||||||
@docker exec aio /usr/bin/frostfs-s3-authmate issue-secret \
|
@docker exec aio /usr/bin/issue-creds.sh
|
||||||
--wallet /config/user-wallet.json \
|
|
||||||
--peer localhost:8080 \
|
|
||||||
--gate-public-key $(S3_GATE_PUBLIC_KEY) \
|
|
||||||
--container-placement-policy "REP 1"
|
|
||||||
|
|
||||||
# Generate S3 credentials based on imported wallets
|
# Generate S3 credentials based on imported wallets
|
||||||
s3cred-custom:
|
s3cred-custom:
|
||||||
@docker exec aio /usr/bin/frostfs-s3-authmate issue-secret \
|
@docker exec aio /usr/bin/issue-creds.sh $(wallet)
|
||||||
--wallet /wallets/$(wallet) \
|
|
||||||
--peer localhost:8080 \
|
|
||||||
--gate-public-key $(S3_GATE_PUBLIC_KEY) \
|
|
||||||
--container-placement-policy "REP 1"
|
|
||||||
|
|
||||||
enable-oracle:
|
enable-oracle:
|
||||||
@docker exec aio neo-go contract invokefunction -r http://localhost:30333 \
|
@docker exec aio neo-go contract invokefunction -r http://localhost:30333 \
|
||||||
|
|
|
@ -62,7 +62,8 @@ Data and the system configuration is stored in container's volume.
|
||||||
Next time container is started, it will take less time to initialize.
|
Next time container is started, it will take less time to initialize.
|
||||||
|
|
||||||
Before updating image version, reset `frostfs-aio` by clearing its local volume
|
Before updating image version, reset `frostfs-aio` by clearing its local volume
|
||||||
before starting container.
|
before starting container. Update may contain incompatible changes, e.g. neo-go
|
||||||
|
database format update. This repository does not provide any migration tools.
|
||||||
|
|
||||||
```
|
```
|
||||||
$ make clean
|
$ make clean
|
||||||
|
|
|
@ -31,6 +31,8 @@ configure() {
|
||||||
|
|
||||||
/usr/bin/frostfs-adm morph refill-gas --config /config/frostfs-adm.yml --storage-wallet /config/wallet-sn.json --gas 10.0 || die "Failed to transfer GAS to alphabet wallets"
|
/usr/bin/frostfs-adm morph refill-gas --config /config/frostfs-adm.yml --storage-wallet /config/wallet-sn.json --gas 10.0 || die "Failed to transfer GAS to alphabet wallets"
|
||||||
|
|
||||||
|
/usr/bin/frostfs-adm morph proxy-add-account --config /config/frostfs-adm.yml --account NejLbQpojKJWec4NQRMBhzsrmCyhXfGJJe || die "Failed to set storage wallet as proxy wallet"
|
||||||
|
|
||||||
/usr/bin/frostfs-adm morph proxy-add-account --config /config/frostfs-adm.yml --account NN1RQ3qwnvDMVNsQw4WPkKi7BrjxdVTDZp || die "Failed to set s3 gateway wallet as proxy wallet"
|
/usr/bin/frostfs-adm morph proxy-add-account --config /config/frostfs-adm.yml --account NN1RQ3qwnvDMVNsQw4WPkKi7BrjxdVTDZp || die "Failed to set s3 gateway wallet as proxy wallet"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
32
bin/issue-creds.sh
Executable file
32
bin/issue-creds.sh
Executable file
|
@ -0,0 +1,32 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
initUser() {
|
||||||
|
/usr/bin/frostfs-s3-authmate register-user \
|
||||||
|
--wallet $WALLET_PATH \
|
||||||
|
--rpc-endpoint http://localhost:30333 \
|
||||||
|
--username $USERNAME \
|
||||||
|
--contract-wallet /config/s3-gw-wallet.json >/dev/null 2>&1 && touch $WALLET_CACHE/$USERNAME
|
||||||
|
}
|
||||||
|
|
||||||
|
issueAWS() {
|
||||||
|
/usr/bin/frostfs-s3-authmate issue-secret \
|
||||||
|
--wallet $WALLET_PATH \
|
||||||
|
--peer localhost:8080 \
|
||||||
|
--gate-public-key $S3_GATE_PUBLIC_KEY \
|
||||||
|
--container-placement-policy "REP 1"
|
||||||
|
}
|
||||||
|
|
||||||
|
S3_GATE_PUBLIC_KEY=$(neo-go wallet dump-keys -w /config/s3-gw-wallet.json | tail -1)
|
||||||
|
WALLET_PATH=/wallets/$1
|
||||||
|
if [[ -z "$1" ]]; then
|
||||||
|
WALLET_PATH=/config/user-wallet.json
|
||||||
|
fi
|
||||||
|
|
||||||
|
WALLET_CACHE=/data/wallets
|
||||||
|
mkdir -p $WALLET_CACHE
|
||||||
|
|
||||||
|
USERNAME=$(echo $WALLET_PATH | md5sum | cut -d' ' -f1)
|
||||||
|
if [ ! -e $WALLET_CACHE/$USERNAME ]; then
|
||||||
|
initUser
|
||||||
|
fi
|
||||||
|
issueAWS
|
|
@ -11,6 +11,7 @@ ProtocolConfiguration:
|
||||||
VerifyTransactions: true
|
VerifyTransactions: true
|
||||||
StateRootInHeader: true
|
StateRootInHeader: true
|
||||||
P2PSigExtensions: true
|
P2PSigExtensions: true
|
||||||
|
Hardforks: {}
|
||||||
|
|
||||||
ApplicationConfiguration:
|
ApplicationConfiguration:
|
||||||
SkipBlockVerification: false
|
SkipBlockVerification: false
|
||||||
|
|
|
@ -69,9 +69,6 @@ control:
|
||||||
grpc:
|
grpc:
|
||||||
endpoint: localhost:16515
|
endpoint: localhost:16515
|
||||||
|
|
||||||
frostfsid:
|
|
||||||
validation:
|
|
||||||
enabled: false
|
|
||||||
|
|
||||||
kludge:
|
kludge:
|
||||||
use_default_xmlns: true
|
use_default_xmlns: true
|
||||||
|
bypass_content_encoding_check_in_chunks: true
|
||||||
|
|
|
@ -2,7 +2,6 @@ morph:
|
||||||
rpc_endpoint:
|
rpc_endpoint:
|
||||||
- address: ws://localhost:30333/ws
|
- address: ws://localhost:30333/ws
|
||||||
dial_timeout: 20s
|
dial_timeout: 20s
|
||||||
ape_chain_cache_size: 0
|
|
||||||
|
|
||||||
control:
|
control:
|
||||||
grpc:
|
grpc:
|
||||||
|
|
BIN
vendor/contracts/alphabet/alphabet_contract.nef
vendored
BIN
vendor/contracts/alphabet/alphabet_contract.nef
vendored
Binary file not shown.
BIN
vendor/contracts/balance/balance_contract.nef
vendored
BIN
vendor/contracts/balance/balance_contract.nef
vendored
Binary file not shown.
BIN
vendor/contracts/container/container_contract.nef
vendored
BIN
vendor/contracts/container/container_contract.nef
vendored
Binary file not shown.
BIN
vendor/contracts/frostfs/frostfs_contract.nef
vendored
BIN
vendor/contracts/frostfs/frostfs_contract.nef
vendored
Binary file not shown.
2
vendor/contracts/frostfsid/config.json
vendored
2
vendor/contracts/frostfsid/config.json
vendored
File diff suppressed because one or more lines are too long
BIN
vendor/contracts/frostfsid/frostfsid_contract.nef
vendored
BIN
vendor/contracts/frostfsid/frostfsid_contract.nef
vendored
Binary file not shown.
BIN
vendor/contracts/netmap/netmap_contract.nef
vendored
BIN
vendor/contracts/netmap/netmap_contract.nef
vendored
Binary file not shown.
BIN
vendor/contracts/nns/nns_contract.nef
vendored
BIN
vendor/contracts/nns/nns_contract.nef
vendored
Binary file not shown.
BIN
vendor/contracts/policy/policy_contract.nef
vendored
BIN
vendor/contracts/policy/policy_contract.nef
vendored
Binary file not shown.
BIN
vendor/contracts/processing/processing_contract.nef
vendored
BIN
vendor/contracts/processing/processing_contract.nef
vendored
Binary file not shown.
BIN
vendor/contracts/proxy/proxy_contract.nef
vendored
BIN
vendor/contracts/proxy/proxy_contract.nef
vendored
Binary file not shown.
Loading…
Reference in a new issue