From 272646728f78152cbb2d0218467303d55318dc91 Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Sat, 12 Oct 2024 11:21:44 +0200 Subject: [PATCH] add display --- playbooks/apps/all.yaml | 1 + playbooks/apps/display.yaml | 24 +++++++++++++++++++ .../apps/files/display/docker-compose.yaml | 7 ++++++ playbooks/apps/files/display/update | 3 +++ roles/docker/defaults/main.yaml | 1 + roles/docker/handlers/main.yaml | 1 + 6 files changed, 37 insertions(+) create mode 100644 playbooks/apps/display.yaml create mode 100644 playbooks/apps/files/display/docker-compose.yaml create mode 100755 playbooks/apps/files/display/update diff --git a/playbooks/apps/all.yaml b/playbooks/apps/all.yaml index e0b4c2f..e867308 100644 --- a/playbooks/apps/all.yaml +++ b/playbooks/apps/all.yaml @@ -5,6 +5,7 @@ - import_playbook: checkout.yaml # noqa: name[play] - import_playbook: code.yaml # noqa: name[play] - import_playbook: collabora.yaml # noqa: name[play] +- import_playbook: display.yaml # noqa: name[play] - import_playbook: ghost-update.yaml # noqa: name[play] - import_playbook: gitea.yaml # noqa: name[play] - import_playbook: goatcounter.yaml # noqa: name[play] diff --git a/playbooks/apps/display.yaml b/playbooks/apps/display.yaml new file mode 100644 index 0000000..d680b39 --- /dev/null +++ b/playbooks/apps/display.yaml @@ -0,0 +1,24 @@ +--- +- name: Display + hosts: servers + gather_facts: false + tasks: + - name: Fix git config + community.general.git_config: + scope: global + name: merge.conflictstyle + value: diff3 + - name: Pull git repo + ansible.builtin.git: + executable: /usr/bin/git + repo: https://git.augendre.info/gaugendre/display.git + dest: "{{ dir }}/sources" + version: HEAD # noqa: latest[git] # we want the latest revision + - name: Docker + ansible.builtin.include_role: + name: docker + + vars: + docker_app_name: display + docker_build: always + dir: /mnt/data/{{ docker_app_name }} diff --git a/playbooks/apps/files/display/docker-compose.yaml b/playbooks/apps/files/display/docker-compose.yaml new file mode 100644 index 0000000..bb71a8b --- /dev/null +++ b/playbooks/apps/files/display/docker-compose.yaml @@ -0,0 +1,7 @@ +services: + app: + build: + context: sources + restart: always + ports: + - "9010:80" diff --git a/playbooks/apps/files/display/update b/playbooks/apps/files/display/update new file mode 100755 index 0000000..414bed7 --- /dev/null +++ b/playbooks/apps/files/display/update @@ -0,0 +1,3 @@ +#!/bin/bash +git -C ./sources pull +docker compose --ansi never up -d --build diff --git a/roles/docker/defaults/main.yaml b/roles/docker/defaults/main.yaml index 299a5b2..01f7836 100644 --- a/roles/docker/defaults/main.yaml +++ b/roles/docker/defaults/main.yaml @@ -1,3 +1,4 @@ --- docker_app_name: some-app docker_dir: /mnt/data/{{ docker_app_name }} +docker_build: policy diff --git a/roles/docker/handlers/main.yaml b/roles/docker/handlers/main.yaml index 3a33dd5..29e557f 100644 --- a/roles/docker/handlers/main.yaml +++ b/roles/docker/handlers/main.yaml @@ -8,4 +8,5 @@ community.docker.docker_compose_v2: project_src: "{{ docker_dir }}" state: present + build: "{{ docker_build }}" listen: Restart service