Skip to content

Commit 8ea92d7

Browse files
authored
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 <[email protected]>
1 parent 2f0279c commit 8ea92d7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scripts/common.Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,13 @@ clean-default: .check_clean ## Cleans all outputs
233233
ifeq ($(shell test -f j2cli_customization.py && echo -n yes),yes)
234234
235235
define jinja
236-
.venv/bin/j2 --format=env $(1) .env -o $(2) --customize j2cli_customization.py
236+
$(REPO_BASE_DIR)/.venv/bin/j2 --format=env $(1) .env -o $(2) --customize j2cli_customization.py
237237
endef
238238
239239
else
240240
241241
define jinja
242-
.venv/bin/j2 --format=env $(1) .env -o $(2)
242+
$(REPO_BASE_DIR)/.venv/bin/j2 --format=env $(1) .env -o $(2)
243243
endef
244244
245245
endif

0 commit comments

Comments
 (0)