diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 14d2229..8527dc0 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -13,4 +13,7 @@ install_packages: - net-tools - unattended-upgrades -data_folder: /data \ No newline at end of file +data_folder: /data +alpine_latest_image: "alpine:latest" +ubuntu_latest_image: "node:22-trixie" +debian_latest_image: "git.comprofix.com/mmckinnon/debian-latest:2025.08.31-093853" diff --git a/ansible/main.yml b/ansible/main.yml index bb11c4a..a834d30 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -2,10 +2,7 @@ - name: Prepare all servers hosts: all become: true - vars: - alpine_latest_image: "alpine:latest" - ubuntu_latest_image: "node:22-trixie" - debian_latest_image: "git.comprofix.com/mmckinnon/debian-latest:2025.08.31-093853" + pre_tasks: - name: Create directories diff --git a/ansible/tasks/gitea-runner.yml b/ansible/tasks/gitea-runner.yml index f7f2a4c..be429e4 100644 --- a/ansible/tasks/gitea-runner.yml +++ b/ansible/tasks/gitea-runner.yml @@ -37,4 +37,4 @@ GITEA_INSTANCE_URL: "https://git.comprofix.com" GITEA_RUNNER_REGISTRATION_TOKEN: "{{ GITEA_RUNNER_TOKEN }}" GITEA_RUNNER_NAME: "gtar-runner" - GITEA_RUNNER_LABELS: "alpine-latest:docker://{{ alpine_latest_image }},ubuntu-latest:docker://{{ ubuntu_latest_image }},vps-latest:docker://{{ debian_latest_image }}" \ No newline at end of file + GITEA_RUNNER_LABELS: "alpine-latest:docker://{{ alpine_latest_image }},ubuntu-latest:docker://{{ ubuntu_latest_image }},gtar-latest:docker://{{ debian_latest_image }}" \ No newline at end of file