Skip to content
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

Fix: J2 issue in gitlab CI/CD #904

Merged
merged 23 commits into from
Dec 6, 2024
+2 −2
Merged

Fix: J2 issue in gitlab CI/CD #904

Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
f0d8cf0
wip
mrnicegyu11 Sep 19, 2024
e906b41
Merge remote-tracking branch 'upstream/main' into main
mrnicegyu11 Oct 23, 2024
14c751d
Merge remote-tracking branch 'upstream/main' into main
mrnicegyu11 Oct 23, 2024
293f63c
Add csi-s3 and have portainer use it
mrnicegyu11 Oct 24, 2024
f7f72ec
Change request @hrytsuk 1GB max portainer volume size
mrnicegyu11 Oct 25, 2024
94cfb76
t push
mrnicegyu11 Oct 28, 2024
509c717
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Oct 29, 2024
1a65ecf
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Nov 13, 2024
77ee45e
Merge remote-tracking branch 'upstream/main'
mrnicegyu11 Nov 25, 2024
20569c7
Fix wrong filename
mrnicegyu11 Nov 26, 2024
b2d13b7
Fix registry local deploy
mrnicegyu11 Nov 27, 2024
28660ac
Traefik local deployment fixes
mrnicegyu11 Nov 27, 2024
65907fc
Fix local deployment graylog provisioning
mrnicegyu11 Nov 27, 2024
0961600
Fix j2, double venv
mrnicegyu11 Nov 28, 2024
541df1c
Add python version
mrnicegyu11 Nov 28, 2024
c92ac11
Idempotency for admin-panels
mrnicegyu11 Dec 2, 2024
b3b3ae1
Remove faulty command
mrnicegyu11 Dec 2, 2024
36b193b
Local deploy fixes
mrnicegyu11 Dec 2, 2024
cd22e09
Clean Up Local Minio
mrnicegyu11 Dec 3, 2024
c2c0440
Remove unused code
mrnicegyu11 Dec 3, 2024
511dc0f
Update Minio
mrnicegyu11 Dec 3, 2024
23f6f32
Merge branch 'main' into 2024/makeLocalDeployWorkAgain
mrnicegyu11 Dec 4, 2024
2a7c194
Merge remote-tracking branch 'upstream/main' into 2024/makeLocalDeplo…
mrnicegyu11 Dec 6, 2024
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
4 changes: 2 additions & 2 deletions scripts/common.Makefile
View file
Open in desktop
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
Loading