From d0783e57b3a8d1da85d779c83bdca2b3520dc76f Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Tue, 27 Feb 2024 17:48:14 +0300 Subject: [PATCH 1/2] .env: use the latest and greatest HTTP gw Signed-off-by: Roman Khimov --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 48faaa0..f2ed48e 100644 --- a/.env +++ b/.env @@ -26,7 +26,7 @@ NATS_VERSION=2.7.2 NATS_IMAGE=nats # HTTP Gate -HTTP_GW_VERSION=0.27.5 +HTTP_GW_VERSION=0.28.0 HTTP_GW_IMAGE=nspccdev/neofs-http-gw # REST Gate From 2053014ce5ae3fc805cf81ac6a149d72ca063e93 Mon Sep 17 00:00:00 2001 From: Roman Khimov Date: Tue, 27 Feb 2024 17:55:39 +0300 Subject: [PATCH 2/2] env: update NeoFS to 0.40.1 Adapt to new release file set as well. Signed-off-by: Roman Khimov --- .env | 10 +++++----- services/ir/artifacts.mk | 16 ++++------------ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.env b/.env index f2ed48e..056c495 100644 --- a/.env +++ b/.env @@ -14,11 +14,11 @@ NEO_GO_PLATFORM=linux-amd64 NEO_GO_URL=https://github.com/nspcc-dev/neo-go/releases/download/v${NEOGO_VERSION}/neo-go-${NEO_GO_PLATFORM} # NeoFS InnerRing nodes -IR_VERSION=0.39.1 +IR_VERSION=0.40.1 IR_IMAGE=nspccdev/neofs-ir # NeoFS Storage nodes -NODE_VERSION=0.39.1 +NODE_VERSION=0.40.1 NODE_IMAGE=nspccdev/neofs-storage # NATS Server @@ -45,12 +45,12 @@ COREDNS_VERSION=v016 COREDNS_IMAGE=nspccdev/coredns # NeoFS CLI binary -NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.39.1/neofs-cli-amd64.tar.gz +NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.40.1/neofs-cli-linux-amd64 #NEOFS_CLI_PATH=/path/to/neofs-cli-binary # NeoFS ADM tool binary -NEOFS_ADM_VERSION=v0.39.1 -NEOFS_ADM_URL=https://github.com/nspcc-dev/neofs-node/releases/download/${NEOFS_ADM_VERSION}/neofs-adm-amd64.tar.gz +NEOFS_ADM_VERSION=v0.40.1 +NEOFS_ADM_URL=https://github.com/nspcc-dev/neofs-node/releases/download/${NEOFS_ADM_VERSION}/neofs-adm-linux-amd64 #NEOFS_ADM_PATH=/path/to/neofs-adm-binary # Compiled NeoFS Smart Contracts diff --git a/services/ir/artifacts.mk b/services/ir/artifacts.mk index 5404338..41d5860 100644 --- a/services/ir/artifacts.mk +++ b/services/ir/artifacts.mk @@ -5,7 +5,6 @@ get.ir: get.cli get.contracts get.adm get.storage prepare.storage # Download NeoFS CLI .ONESHELL: get.cli: NEOFS_CLI_FILE=./vendor/neofs-cli -get.cli: NEOFS_CLI_ARCHIVE_FILE=${NEOFS_CLI_FILE}.tar.gz get.cli: NEOFS_CLI_PATH?= get.cli: @touch services/ir/.ir.env # https://github.com/docker/compose/issues/3560 @@ -13,12 +12,8 @@ get.cli: ifeq (${NEOFS_CLI_PATH},) @echo "⇒ Download NeoFS CLI binary from ${NEOFS_CLI_URL}" - @curl \ - -sSL "${NEOFS_CLI_URL}" \ - -o ${NEOFS_CLI_ARCHIVE_FILE} - @tar -xvf ${NEOFS_CLI_ARCHIVE_FILE} -C ./vendor | xargs -I {} \ - mv ./vendor/{} ${NEOFS_CLI_FILE} - @rm ${NEOFS_CLI_ARCHIVE_FILE} + @curl -sSL "${NEOFS_CLI_URL}" -o ${NEOFS_CLI_FILE} + @chmod 755 ${NEOFS_CLI_FILE} else @echo "⇒ Copy local binary from ${NEOFS_CLI_PATH}" @cp ${NEOFS_CLI_PATH} ${NEOFS_CLI_FILE} @@ -43,15 +38,12 @@ endif # Download NeoFS ADM tool get.adm: NEOFS_ADM_DEST=./vendor/neofs-adm -get.adm: NEOFS_ADM_ARCHIVE=neofs-adm.tar.gz get.adm: ifeq (${NEOFS_ADM_PATH},) @echo "⇒ Download NeoFS ADM binary from ${NEOFS_ADM_URL}" - @curl -sSL ${NEOFS_ADM_URL} -o ${NEOFS_ADM_ARCHIVE} - @tar -xvf ${NEOFS_ADM_ARCHIVE} -C ./vendor | xargs -I {} \ - mv ./vendor/{} ${NEOFS_ADM_DEST} - @rm ${NEOFS_ADM_ARCHIVE} + @curl -sSL ${NEOFS_ADM_URL} -o ${NEOFS_ADM_DEST} + @chmod 755 ${NEOFS_ADM_DEST} else @echo "⇒ Copy neofs-adm binary from ${NEOFS_ADM_PATH}" @cp ${NEOFS_ADM_PATH} ${NEOFS_ADM_DEST}