Skip to content

Fix portainer makefile #1131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 17, 2025
Merged

Fix portainer makefile #1131

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a7089d1
Automatically configure registry in portainer
YuryHrytsuk Jul 15, 2025
669f2cb
Merge remote-tracking branch 'upstream/main' into add-portainer-regis…
YuryHrytsuk Jul 15, 2025
b264a2e
Merge remote-tracking branch 'upstream/main' into add-portainer-regis…
YuryHrytsuk Jul 15, 2025
d672244
Update
YuryHrytsuk Jul 15, 2025
603160c
Imrpove wait for it installation
YuryHrytsuk Jul 16, 2025
8053bbb
Fix portainer makefile wrong options
YuryHrytsuk Jul 17, 2025
23fed01
Merge remote-tracking branch 'upstream/main' into fix-portainer-makefile
YuryHrytsuk Jul 17, 2025
db91b28
fix
YuryHrytsuk Jul 17, 2025
ae784bd
spacing
YuryHrytsuk Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions services/portainer/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,38 @@ include ${REPO_BASE_DIR}/scripts/common.Makefile
.PHONY: up ## Deploys portainer stack
up: .init .env secrets ${TEMP_COMPOSE}
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE} ${STACK_NAME}
@$(MAKE) --noprint configure-portainer-registry
@$(MAKE) --no-print-directory configure-portainer-registry

.PHONY: up-local ## Deploys portainer stack for local deployment
up-local: .init .env secrets ${TEMP_COMPOSE} ${TEMP_COMPOSE}-local
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-local ${STACK_NAME}
@$(MAKE) --noprint configure-portainer-registry
@$(MAKE) --no-print-directory configure-portainer-registry

.PHONY: up-dalco ## Deploys portainer stack for Dalco Cluster
up-dalco: .init .env secrets ${TEMP_COMPOSE}-dalco
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-dalco ${STACK_NAME}
@$(MAKE) --noprint configure-portainer-registry
@$(MAKE) --no-print-directory configure-portainer-registry

.PHONY: up-aws ## Deploys portainer stack for AWS
up-aws: .init .env secrets ${TEMP_COMPOSE}-aws
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-aws ${STACK_NAME}
@$(MAKE) --noprint configure-portainer-registry
@$(MAKE) --no-print-directory configure-portainer-registry

.PHONY: up-public ## Deploys portainer stack for public access Cluster
up-public: up-dalco

.PHONY: up-master ## Deploys portainer stack for master Cluster
up-master: .init .env secrets ${TEMP_COMPOSE}-master
@docker stack deploy --with-registry-auth --prune --compose-file ${TEMP_COMPOSE}-master ${STACK_NAME}
@$(MAKE) --noprint configure-portainer-registry

@$(MAKE) --no-print-directory configure-portainer-registry

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


# Helpers -------------------------------------------------

.PHONY: ${TEMP_COMPOSE}
Expand Down
Loading