status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

compose/systemd: fix completion of make targets 

Something goes wrong when parsing and GRN definition is treated as target.

Signed-off-by: Jakub Sokołowski <jakub@status.im>
This commit is contained in:
Jakub Sokołowski 2021-08-24 15:13:10 +02:00 committed by Jakub
parent 06587bd1bc
commit 5c408f8ce4
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
_assets/compose/bootnode/Makefile
View File

@ -19,16 +19,20 @@ export LOG_LEVEL ?= 3
export LISTEN_PORT ?= 30301 export LISTEN_PORT ?= 30301
export API_MODULES ?= eth,web3,admin export API_MODULES ?= eth,web3,admin
NODE_ADDR = $(shell cat keys/nodeaddr)
ENODE_ADDR = enode://$(NODE_ADDR)@$(PUBLIC_IP):$(LISTEN_PORT)
define INFO_MSG define INFO_MSG
* $(GRN)Your bootnode is listening on:$(RST) $(BLD)$(PUBLIC_IP):$(LISTEN_PORT)$(RST) * $(GRN)Your bootnode is listening on:$(RST) $(BLD)$(PUBLIC_IP):$(LISTEN_PORT)$(RST)
* $(GRN)Your enode address is:$(RST)
$(ENODE_ADDR)
$(YLW)Make sure that address and UDP port are available from the internet!$(RST) $(YLW)Make sure that address and UDP port are available from the internet!$(RST)
$(GRN)Your enode address is:$(RST)
endef endef
export INFO_MSG export INFO_MSG
all: checks start show info enode all: checks start show info enode-qr
checks: checks:
ifeq (, $(shell which docker)) ifeq (, $(shell which docker))
@ -51,10 +55,14 @@ ifndef CONTAINER_NAME
endif endif
enode: keys/nodeaddr enode: keys/nodeaddr
@echo "enode://$(shell cat keys/nodeaddr)@$(PUBLIC_IP):$(LISTEN_PORT)" @echo $(ENODE_ADDR)
enode-qr: keys/nodeaddr
@qrencode -t UTF8 $(ENODE_ADDR)
logs: LOG_LINES ?= 100
logs: logs:
docker-compose logs -f -t --tail=100 docker-compose logs -f -t --tail=$(LOG_LINES)
info: info:
@echo "$$INFO_MSG" @echo "$$INFO_MSG"

6
_assets/compose/mailserver/Makefile
View File

@ -24,8 +24,7 @@ export MAIL_PASSWORD ?= status-offline-inbox
define INFO_MSG define INFO_MSG
* $(GRN)Your mailserver is listening on:$(RST) $(BLD)$(PUBLIC_IP):$(LISTEN_PORT)$(RST) * $(GRN)Your mailserver is listening on:$(RST) $(BLD)$(PUBLIC_IP):$(LISTEN_PORT)$(RST)
* $(GRN)Your enode address is:$(RST)
$(GRN)Your enode address is:$(RST)
$(shell $(GIT_ROOT)/_assets/scripts/get_enode.sh 2>/dev/null) $(shell $(GIT_ROOT)/_assets/scripts/get_enode.sh 2>/dev/null)
$(YLW)Make sure that IP and TCP port are available from the internet!$(RST) $(YLW)Make sure that IP and TCP port are available from the internet!$(RST)
@ -66,8 +65,9 @@ enode:
enode-qr: enode-qr:
@$(GIT_ROOT)/_assets/scripts/get_enode.sh --qr @$(GIT_ROOT)/_assets/scripts/get_enode.sh --qr
logs: LOG_LINES ?= 100
logs: logs:
docker-compose logs -f -t --tail=100 docker-compose logs -f -t --tail=$(LOG_LINES)
start: config start: config
@echo " * $(GRN)Starting '$(CONTAINER_NAME)' container...$(RST)" @echo " * $(GRN)Starting '$(CONTAINER_NAME)' container...$(RST)"

10
_assets/systemd/bootnode/Makefile
View File

@ -29,16 +29,16 @@ export LOG_LEVEL ?= 3
export LISTEN_PORT ?= 30301 export LISTEN_PORT ?= 30301
# Info # Info
STATUS = $(shell systemctl $(SCTL_OPTS) is-active $(SERVICE_NAME)) STATUS = $(shell systemctl $(SCTL_OPTS) is-active $(SERVICE_NAME))
NODE_ADDR = $(shell cat $(ADDR_PATH)) NODE_ADDR = $(shell cat $(ADDR_PATH))
ENODE = enode://$(NODE_ADDR)@$(PUBLIC_IP):$(LISTEN_PORT) ENODE_ADDR = enode://$(NODE_ADDR)@$(PUBLIC_IP):$(LISTEN_PORT)
define INFO_MSG define INFO_MSG
* $(GRN)Your bootnode is listening on:$(RST) $(BLD)$(PUBLIC_IP):$(LISTEN_PORT)$(RST) * $(GRN)Your bootnode is listening on:$(RST) $(BLD)$(PUBLIC_IP):$(LISTEN_PORT)$(RST)
* $(GRN)Your enode address is:$(RST)
$(ENODE_ADDR)
$(YLW)Make sure that IP and TCP port are available from the internet!$(RST) $(YLW)Make sure that IP and TCP port are available from the internet!$(RST)
$(GRN)Your enode address is:$(RST)
$(ENODE)
endef endef
export INFO_MSG export INFO_MSG

3
_assets/systemd/mailserver/Makefile
View File

@ -34,8 +34,7 @@ STATUS = $(shell systemctl $(SCTL_OPTS) is-active $(SERVICE_NAME))
define INFO_MSG define INFO_MSG
* $(GRN)Your mailserver is listening on:$(RST) $(BLD)$(PUBLIC_IP):$(LISTEN_PORT)$(RST) * $(GRN)Your mailserver is listening on:$(RST) $(BLD)$(PUBLIC_IP):$(LISTEN_PORT)$(RST)
* $(GRN)Your enode address is:$(RST)
$(GRN)Your enode address is:$(RST)
$(shell $(GIT_ROOT)/_assets/scripts/get_enode.sh 2>/dev/null) $(shell $(GIT_ROOT)/_assets/scripts/get_enode.sh 2>/dev/null)
$(YLW)Make sure that IP and TCP port are available from the internet!$(RST) $(YLW)Make sure that IP and TCP port are available from the internet!$(RST)