Skip to content

Commit 603160c

Browse files
committed
Imrpove wait for it installation
1 parent d672244 commit 603160c

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

scripts/common.Makefile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -374,9 +374,14 @@ endif
374374
375375
WAIT_FOR_IT := $(REPO_BASE_DIR)/scripts/wait4x
376376
377+
alias: $(WAIT_FOR_IT)
378+
377379
# https://github.com/wait4x/wait4x
378-
$(WAIT_FOR_IT):
379-
@curl --output-dir /tmp --silent --location --remote-name https://github.com/wait4x/wait4x/releases/download/v3.5.0/wait4x-linux-amd64.tar.gz
380-
@tar -xf /tmp/wait4x-linux-amd64.tar.gz -C $(REPO_BASE_DIR)/scripts/
381-
@rm /tmp/wait4x-linux-amd64.tar.gz
382-
$@ version
380+
$(WAIT_FOR_IT): ## installs wait4x utility for WAIT_FOR_IT functionality
381+
# installing wait4x
382+
@mkdir --parents /tmp/wait4x
383+
@cd /tmp/wait4x && curl --silent --location --remote-name https://github.com/wait4x/wait4x/releases/download/v3.5.0/wait4x-linux-amd64.tar.gz
384+
@tar -xf /tmp/wait4x/wait4x-linux-amd64.tar.gz -C /tmp/wait4x
385+
@mv /tmp/wait4x/wait4x $@
386+
@rm -rf /tmp/wait4x
387+
@$@ version

services/portainer/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ up-master: .init .env secrets ${TEMP_COMPOSE}-master
4242

4343

4444
.PHONY: configure-portainer-registry
45-
configure-portainer-registry: venv $(VENV_BIN)/python $(WAIT_FOR_IT) ## Add if necessary dockerhub registry configuration to portainer.
45+
configure-portainer-registry: venv $(VENV_BIN)/python $(WAIT_FOR_IT) ## Add registry to Portainer
4646
@$(MAKE) --no-print install REQUIREMENTS_FILE=./scripts/requirements.txt
4747
@set -o allexport; source $(REPO_CONFIG_LOCATION); set +o allexport; \
4848
$(WAIT_FOR_IT) http $$PORTAINER_URL --timeout=120s --interval=5s --expect-status-code 200 && \

0 commit comments

Comments
 (0)