mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2025-11-26 14:46:56 +00:00
Solved multiple MIG bugs
This commit is contained in:
@@ -19,3 +19,5 @@
|
|||||||
mode: 0700
|
mode: 0700
|
||||||
owner: root
|
owner: root
|
||||||
group: root
|
group: root
|
||||||
|
|
||||||
|
- include_tasks: utils/run_once.yml
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
- block:
|
- include_tasks: 01_core.yml
|
||||||
- include_tasks: 01_core.yml
|
|
||||||
- include_tasks: utils/run_once.yml
|
|
||||||
when: run_once_docker_compose is not defined
|
when: run_once_docker_compose is not defined
|
||||||
|
|
||||||
- name: "Load variables from {{ DOCKER_COMPOSE_VARIABLE_FILE }} for whole play"
|
- name: "Load variables from {{ DOCKER_COMPOSE_VARIABLE_FILE }} for whole play"
|
||||||
|
|||||||
@@ -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"
|
DOCKER_COMPOSE_DOWN_ALL_PACKAGE: "docodol"
|
||||||
@@ -274,6 +274,13 @@ input:checked {
|
|||||||
border-color: var(--color-01-70);
|
border-color: var(--color-01-70);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
input[type="checkbox"] {
|
||||||
|
appearance: auto;
|
||||||
|
-webkit-appearance: auto;
|
||||||
|
-moz-appearance: auto;
|
||||||
|
background: none;
|
||||||
|
}
|
||||||
|
|
||||||
option {
|
option {
|
||||||
background-color: var(--color-01-82);
|
background-color: var(--color-01-82);
|
||||||
color: var(--color-01-07);
|
color: var(--color-01-07);
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ server:
|
|||||||
- https://cdn.jsdelivr.net
|
- https://cdn.jsdelivr.net
|
||||||
connect-src:
|
connect-src:
|
||||||
- https://ka-f.fontawesome.com
|
- https://ka-f.fontawesome.com
|
||||||
|
- https://cdn.jsdelivr.net
|
||||||
frame-ancestors:
|
frame-ancestors:
|
||||||
- "*" # No damage if it's used somewhere on other websites, it anyhow looks like art
|
- "*" # No damage if it's used somewhere on other websites, it anyhow looks like art
|
||||||
flags:
|
flags:
|
||||||
|
|||||||
3
roles/web-app-mig/files/style.css
Normal file
3
roles/web-app-mig/files/style.css
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
#details h6, #details p{
|
||||||
|
color: var(--color-01-73)
|
||||||
|
}
|
||||||
@@ -3,22 +3,12 @@
|
|||||||
name: sys-cli
|
name: sys-cli
|
||||||
when: run_once_sys_cli is not defined
|
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 }}'"
|
- name: "load docker, proxy for '{{ application_id }}'"
|
||||||
include_role:
|
include_role:
|
||||||
name: sys-stk-full-stateless
|
name: sys-stk-full-stateless
|
||||||
|
vars:
|
||||||
|
docker_compose_flush_handlers: true
|
||||||
|
docker_pull_git_repository: true
|
||||||
|
|
||||||
- name: Build data (single async task)
|
- name: Build data (single async task)
|
||||||
include_tasks: 02_build_data.yml
|
include_tasks: 02_build_data.yml
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
- name: Build data (single async task)
|
- name: Build data (single async task)
|
||||||
shell: |
|
shell: |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
infinito build tree --no-signal --alarm-timeout 0 -s {{ mig_roles_meta_volume }}
|
infinito build tree --no-signal --alarm-timeout 0 -s {{ MIG_ROLES_DIRECTORY }}
|
||||||
infinito build roles_list --no-signal --alarm-timeout 0 -o {{ mig_roles_meta_list }}
|
infinito build roles_list --no-signal --alarm-timeout 0 -o {{ MIG_ROLES_LIST }}
|
||||||
async: "{{ (3600 if ASYNC_ENABLED | bool else omit) }}"
|
async: "{{ (3600 if ASYNC_ENABLED | bool else omit) }}"
|
||||||
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
|
poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}"
|
||||||
register: mig_build_job
|
|
||||||
|
|||||||
@@ -12,11 +12,9 @@
|
|||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
pull_policy: never
|
pull_policy: never
|
||||||
volumes:
|
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"
|
- "{{ docker_repository_path }}:/usr/share/nginx/html"
|
||||||
{% include 'roles/docker-container/templates/networks.yml.j2' %}
|
{% include 'roles/docker-container/templates/networks.yml.j2' %}
|
||||||
{% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
|
{% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
|
||||||
|
|
||||||
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
{% include 'roles/docker-compose/templates/networks.yml.j2' %}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
application_id: web-app-mig
|
application_id: web-app-mig
|
||||||
|
|
||||||
# Docker
|
# Docker
|
||||||
docker_compose_flush_handlers: true
|
|
||||||
docker_pull_git_repository: true
|
|
||||||
docker_repository_address: "https://github.com/kevinveenbirkenbach/meta-infinite-graph"
|
docker_repository_address: "https://github.com/kevinveenbirkenbach/meta-infinite-graph"
|
||||||
|
|
||||||
# Helper variables
|
# Helper variables
|
||||||
MIG_IMAGE: "mig:latest"
|
MIG_IMAGE: "mig:latest"
|
||||||
MIG_CONTAINER: "mig"
|
MIG_CONTAINER: "mig"
|
||||||
MIG_BUILD_DATA: "{{ applications | get_app_conf(application_id, 'build_data.enabled') }}"
|
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 }}"
|
||||||
Reference in New Issue
Block a user