Skip to content

Commit

Permalink
Fix: J2 issue in gitlab CI/CD (#904)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
mrnicegyu11 and mrnicegyu11 authored Dec 6, 2024
1 parent 2f0279c commit 8ea92d7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions scripts/common.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8ea92d7

Please sign in to comment.