From 8ea92d7dd3d742e7a9c9997f2c96e3fe0cb18357 Mon Sep 17 00:00:00 2001
From: Dustin Kaiser <8209087+mrnicegyu11@users.noreply.github.com>
Date: Fri, 6 Dec 2024 15:24:31 +0100
Subject: [PATCH] Fix: J2 issue in gitlab CI/CD (#904)

* wip

* Add csi-s3 and have portainer use it

* Change request @hrytsuk 1GB max portainer volume size

* Fix wrong filename

* Fix registry local deploy

* Traefik local deployment fixes

* Fix local deployment graylog provisioning

* Fix j2, double venv

* Add python version

* Idempotency for admin-panels

* Remove faulty command

* Local deploy fixes

* Clean Up Local Minio

* Remove unused code

* Update Minio

---------

Co-authored-by: Dustin Kaiser <mail@dustinkaiser.eu>
---
 scripts/common.Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/common.Makefile b/scripts/common.Makefile
index 6781b628..c54be7cf 100644
--- a/scripts/common.Makefile
+++ b/scripts/common.Makefile
@@ -233,13 +233,13 @@ clean-default: .check_clean ## Cleans all outputs
 ifeq ($(shell test -f j2cli_customization.py && echo -n yes),yes)
 
 define jinja
-	.venv/bin/j2 --format=env $(1) .env -o $(2) --customize j2cli_customization.py
+	$(REPO_BASE_DIR)/.venv/bin/j2 --format=env $(1) .env -o $(2) --customize j2cli_customization.py
 endef
 
 else
 
 define jinja
-	.venv/bin/j2 --format=env $(1) .env -o $(2)
+	$(REPO_BASE_DIR)/.venv/bin/j2 --format=env $(1) .env -o $(2)
 endef
 
 endif