From 8ed24e82482cb82957aed4c578ac59825f87079d Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Fri, 16 Jul 2021 16:53:35 +0300 Subject: [PATCH] [#116] Update S3 gate to v0.16.0 (#116) With latest release we don't need special key files, instead we can work with NEP-6 wallets that can be unrelated to user.key wallet. Signed-off-by: Alex Vanin --- .env | 2 +- services/s3_gate/docker-compose.yml | 8 +++----- services/s3_gate/hcs.pub.key | 1 - services/s3_gate/hcs.sec.key | 1 - services/s3_gate/user.key | 1 - services/s3_gate/wallet.json | 1 + 6 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 services/s3_gate/hcs.pub.key delete mode 100644 services/s3_gate/hcs.sec.key delete mode 100644 services/s3_gate/user.key create mode 100644 services/s3_gate/wallet.json diff --git a/.env b/.env index 036b6a8..547c132 100644 --- a/.env +++ b/.env @@ -23,7 +23,7 @@ HTTP_GW_VERSION=0.15.1 HTTP_GW_IMAGE=nspccdev/neofs-http-gw # S3 Gate -S3_GW_VERSION=0.15.0 +S3_GW_VERSION=0.16.0 S3_GW_IMAGE=nspccdev/neofs-s3-gw # NeoFS LOCODE database diff --git a/services/s3_gate/docker-compose.yml b/services/s3_gate/docker-compose.yml index 469c846..4939677 100644 --- a/services/s3_gate/docker-compose.yml +++ b/services/s3_gate/docker-compose.yml @@ -13,17 +13,15 @@ services: internet: ipv4_address: ${IPV4_PREFIX}.82 volumes: - - ./user.key:/user.key - - ./hcs.pub.key:/hcs.pub.key - - ./hcs.sec.key:/hcs.sec.key + - ./wallet.json:/wallet.json - ./tls.key:/tls.key - ./tls.crt:/tls.crt - ./../../vendor/hosts:/etc/hosts stop_signal: SIGKILL env_file: [ ".env", ".s3.env" ] environment: - - S3_GW_AUTH-KEY=/hcs.sec.key - - S3_GW_NEOFS-KEY=/user.key + - S3_GW_WALLET=/wallet.json + - S3_GW_WALLET_PASSPHRASE=s3 - S3_GW_TLS_KEY_FILE=/tls.key - S3_GW_TLS_CERT_FILE=/tls.crt - S3_GW_LISTEN_ADDRESS=s3.${LOCAL_DOMAIN}:8080 diff --git a/services/s3_gate/hcs.pub.key b/services/s3_gate/hcs.pub.key deleted file mode 100644 index d286f7b..0000000 --- a/services/s3_gate/hcs.pub.key +++ /dev/null @@ -1 +0,0 @@ -d#BA\Eϼ-^r=n * \ No newline at end of file diff --git a/services/s3_gate/hcs.sec.key b/services/s3_gate/hcs.sec.key deleted file mode 100644 index a579c54..0000000 --- a/services/s3_gate/hcs.sec.key +++ /dev/null @@ -1 +0,0 @@ - 1&,Яn-Ù0 \ No newline at end of file diff --git a/services/s3_gate/user.key b/services/s3_gate/user.key deleted file mode 100644 index ba2021b..0000000 --- a/services/s3_gate/user.key +++ /dev/null @@ -1 +0,0 @@ -?ܳv/l \ No newline at end of file diff --git a/services/s3_gate/wallet.json b/services/s3_gate/wallet.json new file mode 100644 index 0000000..4dda6aa --- /dev/null +++ b/services/s3_gate/wallet.json @@ -0,0 +1 @@ +{"version":"3.0","accounts":[{"address":"NUUb82KR2JrVByHs2YSKgtK29gKnF5q6Vt","key":"6PYSPET41jKtqie2cfkqgy7q9ueeucH8bX9Gotm2HwdNEDptj6aBe8dDg8","label":"NeoFS S3 Gate","contract":{"script":"DCEDE7GsOoB24VWn55eyTwtlDMytWUHqWdfP1RoCSosqBr9BVuezJw==","parameters":[{"name":"parameter0","type":"Signature"}],"deployed":false},"lock":false,"isDefault":false}],"scrypt":{"n":16384,"r":8,"p":8},"extra":{"Tokens":null}}