diff --git a/.vscode/cspell_custom.txt b/.vscode/cspell_custom.txt index 512eddb..3a5a1c8 100644 --- a/.vscode/cspell_custom.txt +++ b/.vscode/cspell_custom.txt @@ -1,6 +1,7 @@ aggrid CHACHA configmap +Containerfile containerignore devcontainer devcontainers @@ -8,15 +9,18 @@ dotenv ENDCOLOR ensurepath envsubst +filepicker getent gitmessage hostvars +humanfriendly keygen LAZYGIT lightspeed lineinfile minica Mountpoint +naturalsize nicegui noarchive noimageindex diff --git a/anvil/ansible/group_vars/all/container.yml b/anvil/ansible/group_vars/all/container.yml new file mode 100644 index 0000000..6be86b7 --- /dev/null +++ b/anvil/ansible/group_vars/all/container.yml @@ -0,0 +1,3 @@ +--- +forge_container_file: "Containerfile" +forge_container_format: "oci" diff --git a/anvil/ansible/playbooks/project_build.yml b/anvil/ansible/playbooks/project_build.yml index 3f4b9e6..5c32129 100644 --- a/anvil/ansible/playbooks/project_build.yml +++ b/anvil/ansible/playbooks/project_build.yml @@ -14,8 +14,8 @@ tag: latest path: "{{ forge_git_repository_destination }}" build: - file: Containerfile - format: oci + file: "{{ forge_container_file | default('Containerfile') }}" + format: "{{ forge_container_format | default('oci') }}" pull: false push: true push_args: diff --git a/anvil/nicegui/pages/ansible.py b/anvil/nicegui/pages/ansible.py index 6af5646..4b77f67 100644 --- a/anvil/nicegui/pages/ansible.py +++ b/anvil/nicegui/pages/ansible.py @@ -4,7 +4,7 @@ import asyncio import os from nicegui import ui from theme import GuiProgressSpinner -from utils import local_file_picker +from utils.filepicker import local_file_picker ANSIBLE_EXTRA_VARS = None @@ -117,5 +117,4 @@ def content() -> None: with ui.card().classes("w-full"): ui.label("Playbook Log").classes("text-h6") ui.button("Clear Log", on_click=lambda: gui_playbook_log.clear()) - gui_playbook_log = ui.log().classes("w-full h-full") diff --git a/anvil/nicegui/utils/__init__.py b/anvil/nicegui/utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/anvil/nicegui/utils.py b/anvil/nicegui/utils/filepicker.py similarity index 100% rename from anvil/nicegui/utils.py rename to anvil/nicegui/utils/filepicker.py