kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-12-02 15:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor docker-compose/core and Discourse reset logic

Browse Source 
- Move docker-container role loading after directory creation in docker-compose/01_core.yml
- Extend allowed non-fatal errors for docker network disconnect (network missing, container missing, not found)
- Extend allowed non-fatal errors for ./launcher destroy (missing script, missing directory, not found)

Details: https://chatgpt.com/share/692ea63e-7738-800f-bdf1-011e96dc28e5
This commit is contained in:
Kevin Veen-Birkenbach
2025-12-02 09:41:49 +01:00
parent 8314d7e6a6
commit 13b10ff85b
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
roles/docker-compose/tasks/01_core.yml
View File

@@ -9,11 +9,6 @@
include_tasks: 02_reset.yml include_tasks: 02_reset.yml
when: MODE_RESET | bool when: MODE_RESET | bool
- name: "Load docker container role"
include_role:
name: docker-container
when: run_once_docker_container is not defined
- name: "create {{ PATH_DOCKER_COMPOSE_INSTANCES }}" - name: "create {{ PATH_DOCKER_COMPOSE_INSTANCES }}"
file: file:
path: "{{ PATH_DOCKER_COMPOSE_INSTANCES }}" path: "{{ PATH_DOCKER_COMPOSE_INSTANCES }}"
@@ -21,3 +16,8 @@
mode: 0700 mode: 0700
owner: root owner: root
group: root group: root
- name: "Load docker container role"
include_role:
name: docker-container
when: run_once_docker_container is not defined

8
roles/web-app-discourse/tasks/02_reset.yml
View File

@@ -33,7 +33,8 @@
disc_net_disconnect.rc != 0 and disc_net_disconnect.rc != 0 and
('is not connected' not in (disc_net_disconnect.stderr | default('') | lower)) and ('is not connected' not in (disc_net_disconnect.stderr | default('') | lower)) and
('no such network' not in (disc_net_disconnect.stderr | default('') | lower)) and ('no such network' not in (disc_net_disconnect.stderr | default('') | lower)) and
('no such container' not in (disc_net_disconnect.stderr | default('') | lower)) ('no such container' not in (disc_net_disconnect.stderr | default('') | lower)) and
('not found' not in (disc_net_disconnect.stderr | default('') | lower))
- name: "destroy container '{{ DISCOURSE_CONTAINER }}'" - name: "destroy container '{{ DISCOURSE_CONTAINER }}'"
ansible.builtin.command: ansible.builtin.command:
@@ -43,4 +44,7 @@
changed_when: discourse_destroy.rc == 0 changed_when: discourse_destroy.rc == 0
failed_when: > failed_when: >
discourse_destroy.rc != 0 and discourse_destroy.rc != 0 and
('unable to change directory before execution' not in (discourse_destroy.msg | default('') | lower)) ('unable to change directory before execution' not in (discourse_destroy.msg | default('') | lower)) and
('no such file or directory' not in (discourse_destroy.msg | default('') | lower)) and
('no such file or directory' not in (discourse_destroy.stderr | default('') | lower)) and
('not found' not in (discourse_destroy.stderr | default('') | lower))