From aca2da885da4e052d96c08b69bcbb600c11804ba Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Wed, 26 Nov 2025 01:16:22 +0100 Subject: [PATCH] Solved multiple MIG bugs --- roles/docker-compose/tasks/01_core.yml | 12 +++++++----- roles/docker-compose/tasks/main.yml | 4 +--- roles/docker-compose/vars/main.yml | 2 +- .../templates/css/default.css.j2 | 7 +++++++ roles/web-app-mig/config/main.yml | 1 + roles/web-app-mig/files/style.css | 3 +++ roles/web-app-mig/tasks/01_core.yml | 16 +++------------- roles/web-app-mig/tasks/02_build_data.yml | 5 ++--- .../web-app-mig/templates/docker-compose.yml.j2 | 4 +--- roles/web-app-mig/vars/main.yml | 6 +++--- 10 files changed, 29 insertions(+), 31 deletions(-) create mode 100644 roles/web-app-mig/files/style.css diff --git a/roles/docker-compose/tasks/01_core.yml b/roles/docker-compose/tasks/01_core.yml index 3c6ba029..385ec596 100644 --- a/roles/docker-compose/tasks/01_core.yml +++ b/roles/docker-compose/tasks/01_core.yml @@ -14,8 +14,10 @@ - name: "create {{ PATH_DOCKER_COMPOSE_INSTANCES }}" file: - path: "{{ PATH_DOCKER_COMPOSE_INSTANCES }}" - state: directory - mode: 0700 - owner: root - group: root \ No newline at end of file + path: "{{ PATH_DOCKER_COMPOSE_INSTANCES }}" + state: directory + mode: 0700 + owner: root + group: root + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/docker-compose/tasks/main.yml b/roles/docker-compose/tasks/main.yml index 579cc4a7..d207cd5e 100644 --- a/roles/docker-compose/tasks/main.yml +++ b/roles/docker-compose/tasks/main.yml @@ -1,6 +1,4 @@ -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_docker_compose is not defined - name: "Load variables from {{ DOCKER_COMPOSE_VARIABLE_FILE }} for whole play" diff --git a/roles/docker-compose/vars/main.yml b/roles/docker-compose/vars/main.yml index 61c433f8..cdc55831 100644 --- a/roles/docker-compose/vars/main.yml +++ b/roles/docker-compose/vars/main.yml @@ -1,2 +1,2 @@ -DOCKER_COMPOSE_VARIABLE_FILE: "{{ role_path }}/vars/docker-compose.yml" +DOCKER_COMPOSE_VARIABLE_FILE: "{{ [ role_path, 'vars/docker-compose.yml' ] | path_join }}" DOCKER_COMPOSE_DOWN_ALL_PACKAGE: "docodol" \ No newline at end of file diff --git a/roles/sys-front-inj-css/templates/css/default.css.j2 b/roles/sys-front-inj-css/templates/css/default.css.j2 index 667af01d..6b0896f2 100644 --- a/roles/sys-front-inj-css/templates/css/default.css.j2 +++ b/roles/sys-front-inj-css/templates/css/default.css.j2 @@ -274,6 +274,13 @@ input:checked { border-color: var(--color-01-70); } +input[type="checkbox"] { + appearance: auto; + -webkit-appearance: auto; + -moz-appearance: auto; + background: none; +} + option { background-color: var(--color-01-82); color: var(--color-01-07); diff --git a/roles/web-app-mig/config/main.yml b/roles/web-app-mig/config/main.yml index 2c87af51..48f0ba23 100644 --- a/roles/web-app-mig/config/main.yml +++ b/roles/web-app-mig/config/main.yml @@ -26,6 +26,7 @@ server: - https://cdn.jsdelivr.net connect-src: - https://ka-f.fontawesome.com + - https://cdn.jsdelivr.net frame-ancestors: - "*" # No damage if it's used somewhere on other websites, it anyhow looks like art flags: diff --git a/roles/web-app-mig/files/style.css b/roles/web-app-mig/files/style.css new file mode 100644 index 00000000..e338eb96 --- /dev/null +++ b/roles/web-app-mig/files/style.css @@ -0,0 +1,3 @@ +#details h6, #details p{ + color: var(--color-01-73) +} \ No newline at end of file diff --git a/roles/web-app-mig/tasks/01_core.yml b/roles/web-app-mig/tasks/01_core.yml index c4602b6b..7207103e 100644 --- a/roles/web-app-mig/tasks/01_core.yml +++ b/roles/web-app-mig/tasks/01_core.yml @@ -3,22 +3,12 @@ name: sys-cli when: run_once_sys_cli is not defined -- name: Load docker compose vars - include_vars: - file: roles/docker-compose/vars/docker-compose.yml - name: mig_docker_compose - -- name: Set roles volume variable - set_fact: - mig_roles_meta_volume: "{{ mig_docker_compose.docker_compose.directories.volumes }}/roles/" - -- name: Set roles list variable - set_fact: - mig_roles_meta_list: "{{ mig_roles_meta_volume }}list.json" - - name: "load docker, proxy for '{{ application_id }}'" include_role: name: sys-stk-full-stateless + vars: + docker_compose_flush_handlers: true + docker_pull_git_repository: true - name: Build data (single async task) include_tasks: 02_build_data.yml diff --git a/roles/web-app-mig/tasks/02_build_data.yml b/roles/web-app-mig/tasks/02_build_data.yml index de798bd7..4be0f976 100644 --- a/roles/web-app-mig/tasks/02_build_data.yml +++ b/roles/web-app-mig/tasks/02_build_data.yml @@ -1,8 +1,7 @@ - name: Build data (single async task) shell: | set -euo pipefail - infinito build tree --no-signal --alarm-timeout 0 -s {{ mig_roles_meta_volume }} - infinito build roles_list --no-signal --alarm-timeout 0 -o {{ mig_roles_meta_list }} + infinito build tree --no-signal --alarm-timeout 0 -s {{ MIG_ROLES_DIRECTORY }} + infinito build roles_list --no-signal --alarm-timeout 0 -o {{ MIG_ROLES_LIST }} async: "{{ (3600 if ASYNC_ENABLED | bool else omit) }}" poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}" - register: mig_build_job diff --git a/roles/web-app-mig/templates/docker-compose.yml.j2 b/roles/web-app-mig/templates/docker-compose.yml.j2 index 29810345..adfe89d7 100644 --- a/roles/web-app-mig/templates/docker-compose.yml.j2 +++ b/roles/web-app-mig/templates/docker-compose.yml.j2 @@ -12,11 +12,9 @@ dockerfile: Dockerfile pull_policy: never volumes: - - "{{ mig_roles_meta_volume }}:/usr/share/nginx/html/roles:ro" + - "{{ MIG_ROLES_DIRECTORY }}:/usr/share/nginx/html/roles:ro" - "{{ docker_repository_path }}:/usr/share/nginx/html" {% include 'roles/docker-container/templates/networks.yml.j2' %} {% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %} {% include 'roles/docker-compose/templates/networks.yml.j2' %} - - diff --git a/roles/web-app-mig/vars/main.yml b/roles/web-app-mig/vars/main.yml index 9968f0b2..0ace50cf 100644 --- a/roles/web-app-mig/vars/main.yml +++ b/roles/web-app-mig/vars/main.yml @@ -2,11 +2,11 @@ application_id: web-app-mig # Docker -docker_compose_flush_handlers: true -docker_pull_git_repository: true docker_repository_address: "https://github.com/kevinveenbirkenbach/meta-infinite-graph" # Helper variables MIG_IMAGE: "mig:latest" MIG_CONTAINER: "mig" -MIG_BUILD_DATA: "{{ applications | get_app_conf(application_id, 'build_data.enabled') }}" \ No newline at end of file +MIG_BUILD_DATA: "{{ applications | get_app_conf(application_id, 'build_data.enabled') }}" +MIG_ROLES_DIRECTORY: "{{ [ docker_compose.directories.volumes, 'roles' ] | path_join }}" +MIG_ROLES_LIST: "{{ [ MIG_ROLES_DIRECTORY, 'list.json' ] | path_join }}" \ No newline at end of file