Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 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
b4f8021
minorfix
mrnicegyu11 Dec 6, 2024
6b3e975
Merge branch 'main' into 2024/makeLocalDeployWorkAgain
mrnicegyu11 Dec 6, 2024
4350cef
Fix .venv
mrnicegyu11 Dec 6, 2024
272bed8
t push
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
7 changes: 0 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,6 @@ down-maintenance: ## Stop the maintenance mode
fi \
,)

.PHONY: venv
venv: .venv ## Creates a python virtual environment with dev tools (pip, pylint, ...)
.venv:
@python3 -m venv .venv
@.venv/bin/pip3 install --upgrade pip wheel setuptools
@.venv/bin/pip3 install typer
@echo "To activate the venv, execute 'source .venv/bin/activate'"

# Misc: info & clean
.PHONY: info info-vars info-local
Expand Down
16 changes: 10 additions & 6 deletions scripts/common.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -221,13 +221,17 @@ clean-default: .check_clean ## Cleans all outputs
fi

# Helpers -------------------------------------------------
.venv:
# Replace the existing .venv target with the following
$(REPO_BASE_DIR)/.venv/bin/activate:
# creating virtual environment with tooling (jinja, etc)
@python3 -m venv .venv
@.venv/bin/pip3 install --upgrade pip wheel setuptools
@.venv/bin/pip3 install jinja2 j2cli[yaml] typer
@echo "To activate the venv, execute 'source .venv/bin/activate'"

python3 -m venv $(REPO_BASE_DIR)/.venv
$(REPO_BASE_DIR)/.venv/bin/pip3 install --upgrade pip wheel setuptools
$(REPO_BASE_DIR)/.venv/bin/pip3 install jinja2 j2cli[yaml] typer
@echo "To activate the venv, execute 'source $(REPO_BASE_DIR)/.venv/bin/activate'"
PHONY: .venv
.venv: $(REPO_BASE_DIR)/.venv/bin/activate ## Creates a python virtual environment with dev tools (pip, pylint, ...)
.PHONY: venv
venv: $(REPO_BASE_DIR)/.venv/bin/activate ## Creates a python virtual environment with dev tools (pip, pylint, ...)

# https://github.com/kolypto/j2cli?tab=readme-ov-file#customization
ifeq ($(shell test -f j2cli_customization.py && echo -n yes),yes)
Expand Down
Loading