From 5c8bad60914f08ac4715085c87fa631e1b551d11 Mon Sep 17 00:00:00 2001 From: Aine Date: Mon, 16 Jan 2023 12:11:01 +0200 Subject: [PATCH] update borg image tag --- roles/custom/matrix-backup-borg/defaults/main.yml | 5 ++++- roles/custom/matrix-backup-borg/tasks/setup_install.yml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/custom/matrix-backup-borg/defaults/main.yml b/roles/custom/matrix-backup-borg/defaults/main.yml index 472abe976..b8796c92d 100644 --- a/roles/custom/matrix-backup-borg/defaults/main.yml +++ b/roles/custom/matrix-backup-borg/defaults/main.yml @@ -11,8 +11,11 @@ matrix_backup_borg_docker_repo: "https://gitlab.com/etke.cc/borgmatic" matrix_backup_borg_docker_repo_version: main matrix_backup_borg_docker_src_files_path: "{{ matrix_backup_borg_base_path }}/docker-src" -# version determined automatically, based on postgres server version (if enabled), otherwise latest is used +# image and postgres version determined automatically, based on detected postgres server version (if enabled), otherwise latest is used matrix_backup_borg_version: "" +matrix_backup_borg_postgres_version: "" +matrix_backup_borg_borg_version: 1.2.3 +matrix_backup_borg_borgmatic_version: 1.7.5 matrix_backup_borg_docker_image: "{{ matrix_backup_borg_docker_image_name_prefix }}etke.cc/borgmatic:{{ matrix_backup_borg_version }}" matrix_backup_borg_docker_image_name_prefix: "{{ 'localhost/' if matrix_backup_borg_container_image_self_build else 'registry.gitlab.com/' }}" matrix_backup_borg_docker_image_force_pull: "{{ matrix_backup_borg_docker_image.endswith(':latest') or matrix_backup_borg_version | default('') == '' }}" diff --git a/roles/custom/matrix-backup-borg/tasks/setup_install.yml b/roles/custom/matrix-backup-borg/tasks/setup_install.yml index 307542f71..41d953716 100644 --- a/roles/custom/matrix-backup-borg/tasks/setup_install.yml +++ b/roles/custom/matrix-backup-borg/tasks/setup_install.yml @@ -20,7 +20,7 @@ - name: Set the correct borg backup version to use ansible.builtin.set_fact: - matrix_backup_borg_version: "{{ devture_postgres_detected_version }}" + matrix_backup_borg_version: "{{ devture_postgres_detected_version }}-{{ matrix_backup_borg_borg_version }}-{{ matrix_backup_borg_borgmatic_version }}" - name: Ensure borg paths exist ansible.builtin.file: