From b0087a53574f0e995073c4cf829d91747821ac5e Mon Sep 17 00:00:00 2001 From: Angira Kekteeva Date: Wed, 12 Oct 2022 18:04:37 +0400 Subject: [PATCH] [#172] Makefile: Fix comments of targets Signed-off-by: Angira Kekteeva --- Makefile | 5 +++-- services/chain/artifacts.mk | 1 + services/ir/artifacts.mk | 4 +++- services/morph_chain/artifacts.mk | 3 +++ services/nats/artifacts.mk | 2 +- services/storage/artifacts.mk | 4 ++-- services/storage/prepare.mk | 4 +++- 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index d3dc47b..558765d 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ pull: $(foreach SVC, $(PULL_SVCS), $(shell cd services/$(SVC) && docker-compose pull)) @: -# Get all services artifacs +# Get all services artifacts .PHONY: get get: $(foreach SVC, $(GET_SVCS), get.$(SVC)) @: @@ -109,6 +109,7 @@ down/bootstrap: down/%: @docker-compose -f services/$*/docker-compose.yml down +# Generate changes for /etc/hosts .PHONY: vendor/hosts .ONESHELL: vendor/hosts: @@ -122,7 +123,7 @@ vendor/hosts: done < $${file}; done > $@ -# Display changes for /etc/hosts +# Generate and display changes for /etc/hosts .PHONY: hosts hosts: vendor/hosts @cat vendor/hosts diff --git a/services/chain/artifacts.mk b/services/chain/artifacts.mk index 535b867..26548de 100644 --- a/services/chain/artifacts.mk +++ b/services/chain/artifacts.mk @@ -1,4 +1,5 @@ # Download privnet chain dump with pre-deployed NeoFS contracts + get.chain: CHAIN_DUMP_NAME=devenv.dump. get.chain: CHAIN_PATH?= get.chain: diff --git a/services/ir/artifacts.mk b/services/ir/artifacts.mk index fa009b1..d85afcd 100644 --- a/services/ir/artifacts.mk +++ b/services/ir/artifacts.mk @@ -1,10 +1,11 @@ -# Get NeoFS LOCODE database +# Get NeoFS IR artifacts (LOCODE database and NeoFS CLI) LOCODE_DB_ARCHIVE_PATH=./vendor LOCODE_DB_ARCHIVE_FILE=locode_db.gz get.ir: get.locode get.cli +# Get NeoFS LOCODE database get.locode: LOCODE_DB_PATH?= get.locode: @mkdir -p ${LOCODE_DB_ARCHIVE_PATH} @@ -21,6 +22,7 @@ endif gzip -dfk ${LOCODE_DB_ARCHIVE_PATH}/${LOCODE_DB_ARCHIVE_FILE} +# Download NeoFS CLI .ONESHELL: get.cli: NEOFS_CLI_FILE=./vendor/neofs-cli get.cli: NEOFS_CLI_ARCHIVE_FILE=${NEOFS_CLI_FILE}.tar.gz diff --git a/services/morph_chain/artifacts.mk b/services/morph_chain/artifacts.mk index 35efdec..be6febf 100644 --- a/services/morph_chain/artifacts.mk +++ b/services/morph_chain/artifacts.mk @@ -1,6 +1,8 @@ # Download NeoFS Contracts and Adm tool to deploy environment + get.morph_chain: get.contracts get.adm +# Download NeoFS Contracts get.contracts: NEOFS_CONTRACTS_DEST=./vendor/contracts get.contracts: NEOFS_CONTRACTS_ARCHIVE=neofs-contracts.tar.gz get.contracts: @@ -16,6 +18,7 @@ else @cp -r ${NEOFS_CONTRACTS_PATH}/* ${NEOFS_CONTRACTS_DEST} endif +# Download NeoFS ADM tool get.adm: NEOFS_ADM_DEST=./vendor/neofs-adm get.adm: NEOFS_ADM_ARCHIVE=neofs-adm.tar.gz get.adm: diff --git a/services/nats/artifacts.mk b/services/nats/artifacts.mk index c68c57e..83a3bc9 100644 --- a/services/nats/artifacts.mk +++ b/services/nats/artifacts.mk @@ -1,4 +1,4 @@ -# Create new tls certs +# Create new TLS certs for NATS server and clients NATS_DIR=$(abspath services/nats) diff --git a/services/storage/artifacts.mk b/services/storage/artifacts.mk index 4866a32..b78c71a 100644 --- a/services/storage/artifacts.mk +++ b/services/storage/artifacts.mk @@ -1,11 +1,11 @@ -# Create new tls certs +# Create new TLS certs to NeoFS node CURRENT_DIR=$(dir $(abspath $(lastword $(MAKEFILE_LIST)))) STORAGE_DIR=$(patsubst %/,%,$(CURRENT_DIR)) SSL_CONFIG := $(shell mktemp) get.storage: - @echo "⇒ Creating tls certs to NeoFS node" + @echo "⇒ Creating TLS certs to NeoFS node" @(echo "[req]"; \ echo "distinguished_name=req"; \ echo "req_extensions=san"; \ diff --git a/services/storage/prepare.mk b/services/storage/prepare.mk index 22c276b..fad47b1 100644 --- a/services/storage/prepare.mk +++ b/services/storage/prepare.mk @@ -1,3 +1,5 @@ +# Add self-signed node TLS certificate to trusted store + prepare.storage: - @echo "Adding self-signed tls certs to trusted store" + @echo "Adding self-signed TLS certs to trusted store" @./bin/addCert.sh