From 6968594d098444cc3824b3a894fc13aba662507b Mon Sep 17 00:00:00 2001 From: Mathieu Garcia Date: Sat, 29 Nov 2025 22:05:05 +0100 Subject: [PATCH 1/2] refactor(ansible): use string concatenation for upstream GitHub URLs --- .../playbooks/paas/roles/blackbox_exporter/vars/upstream.yml | 2 +- ansible/playbooks/paas/roles/dns_exporter/vars/upstream.yml | 2 +- ansible/playbooks/paas/roles/mongodb_exporter/vars/upstream.yml | 2 +- ansible/playbooks/paas/roles/mysqld_exporter/vars/upstream.yml | 2 +- ansible/playbooks/paas/roles/nginx_exporter/vars/upstream.yml | 2 +- ansible/playbooks/paas/roles/node_exporter/vars/upstream.yml | 2 +- .../playbooks/paas/roles/nvidia_gpu_exporter/vars/upstream.yml | 2 +- ansible/playbooks/paas/roles/phpfpm_exporter/vars/upstream.yml | 2 +- ansible/playbooks/paas/roles/prometheus/vars/upstream.yml | 2 +- ansible/playbooks/paas/roles/promtail/vars/upstream.yml | 2 +- ansible/playbooks/paas/roles/restic/vars/upstream.yml | 2 +- ansible/playbooks/paas/roles/scan_exporter/vars/upstream.yml | 2 +- ansible/playbooks/paas/roles/script_exporter/vars/upstream.yml | 2 +- ansible/playbooks/paas/roles/systemd_exporter/vars/upstream.yml | 2 +- ansible/playbooks/saas/roles/simplestack_ui/vars/upstream.yml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ansible/playbooks/paas/roles/blackbox_exporter/vars/upstream.yml b/ansible/playbooks/paas/roles/blackbox_exporter/vars/upstream.yml index 036aa64c..df805dec 100644 --- a/ansible/playbooks/paas/roles/blackbox_exporter/vars/upstream.yml +++ b/ansible/playbooks/paas/roles/blackbox_exporter/vars/upstream.yml @@ -1,4 +1,4 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}" upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}" diff --git a/ansible/playbooks/paas/roles/dns_exporter/vars/upstream.yml b/ansible/playbooks/paas/roles/dns_exporter/vars/upstream.yml index 2c1d082b..5404bbc8 100644 --- a/ansible/playbooks/paas/roles/dns_exporter/vars/upstream.yml +++ b/ansible/playbooks/paas/roles/dns_exporter/vars/upstream.yml @@ -1,2 +1,2 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json)[0].name | replace('v', '') }}" +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/tags', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json)[0].name | replace('v', '') }}" diff --git a/ansible/playbooks/paas/roles/mongodb_exporter/vars/upstream.yml b/ansible/playbooks/paas/roles/mongodb_exporter/vars/upstream.yml index 036aa64c..df805dec 100644 --- a/ansible/playbooks/paas/roles/mongodb_exporter/vars/upstream.yml +++ b/ansible/playbooks/paas/roles/mongodb_exporter/vars/upstream.yml @@ -1,4 +1,4 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}" upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}" diff --git a/ansible/playbooks/paas/roles/mysqld_exporter/vars/upstream.yml b/ansible/playbooks/paas/roles/mysqld_exporter/vars/upstream.yml index 036aa64c..df805dec 100644 --- a/ansible/playbooks/paas/roles/mysqld_exporter/vars/upstream.yml +++ b/ansible/playbooks/paas/roles/mysqld_exporter/vars/upstream.yml @@ -1,4 +1,4 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}" upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}" diff --git a/ansible/playbooks/paas/roles/nginx_exporter/vars/upstream.yml b/ansible/playbooks/paas/roles/nginx_exporter/vars/upstream.yml index 036aa64c..df805dec 100644 --- a/ansible/playbooks/paas/roles/nginx_exporter/vars/upstream.yml +++ b/ansible/playbooks/paas/roles/nginx_exporter/vars/upstream.yml @@ -1,4 +1,4 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}" upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}" diff --git a/ansible/playbooks/paas/roles/node_exporter/vars/upstream.yml b/ansible/playbooks/paas/roles/node_exporter/vars/upstream.yml index 036aa64c..df805dec 100644 --- a/ansible/playbooks/paas/roles/node_exporter/vars/upstream.yml +++ b/ansible/playbooks/paas/roles/node_exporter/vars/upstream.yml @@ -1,4 +1,4 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}" upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}" diff --git a/ansible/playbooks/paas/roles/nvidia_gpu_exporter/vars/upstream.yml b/ansible/playbooks/paas/roles/nvidia_gpu_exporter/vars/upstream.yml index 036aa64c..df805dec 100644 --- a/ansible/playbooks/paas/roles/nvidia_gpu_exporter/vars/upstream.yml +++ b/ansible/playbooks/paas/roles/nvidia_gpu_exporter/vars/upstream.yml @@ -1,4 +1,4 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}" upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}" diff --git a/ansible/playbooks/paas/roles/phpfpm_exporter/vars/upstream.yml b/ansible/playbooks/paas/roles/phpfpm_exporter/vars/upstream.yml index 036aa64c..df805dec 100644 --- a/ansible/playbooks/paas/roles/phpfpm_exporter/vars/upstream.yml +++ b/ansible/playbooks/paas/roles/phpfpm_exporter/vars/upstream.yml @@ -1,4 +1,4 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}" upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}" diff --git a/ansible/playbooks/paas/roles/prometheus/vars/upstream.yml b/ansible/playbooks/paas/roles/prometheus/vars/upstream.yml index 036aa64c..df805dec 100644 --- a/ansible/playbooks/paas/roles/prometheus/vars/upstream.yml +++ b/ansible/playbooks/paas/roles/prometheus/vars/upstream.yml @@ -1,4 +1,4 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}" upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}" diff --git a/ansible/playbooks/paas/roles/promtail/vars/upstream.yml b/ansible/playbooks/paas/roles/promtail/vars/upstream.yml index 036aa64c..df805dec 100644 --- a/ansible/playbooks/paas/roles/promtail/vars/upstream.yml +++ b/ansible/playbooks/paas/roles/promtail/vars/upstream.yml @@ -1,4 +1,4 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}" upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}" diff --git a/ansible/playbooks/paas/roles/restic/vars/upstream.yml b/ansible/playbooks/paas/roles/restic/vars/upstream.yml index e2c9ed60..2a259292 100644 --- a/ansible/playbooks/paas/roles/restic/vars/upstream.yml +++ b/ansible/playbooks/paas/roles/restic/vars/upstream.yml @@ -1,5 +1,5 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}" unarchived_file_name: "{{ (image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) | split('.bz2'))[0] }}" upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}" diff --git a/ansible/playbooks/paas/roles/scan_exporter/vars/upstream.yml b/ansible/playbooks/paas/roles/scan_exporter/vars/upstream.yml index 036aa64c..df805dec 100644 --- a/ansible/playbooks/paas/roles/scan_exporter/vars/upstream.yml +++ b/ansible/playbooks/paas/roles/scan_exporter/vars/upstream.yml @@ -1,4 +1,4 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}" upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}" diff --git a/ansible/playbooks/paas/roles/script_exporter/vars/upstream.yml b/ansible/playbooks/paas/roles/script_exporter/vars/upstream.yml index 036aa64c..df805dec 100644 --- a/ansible/playbooks/paas/roles/script_exporter/vars/upstream.yml +++ b/ansible/playbooks/paas/roles/script_exporter/vars/upstream.yml @@ -1,4 +1,4 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}" upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}" diff --git a/ansible/playbooks/paas/roles/systemd_exporter/vars/upstream.yml b/ansible/playbooks/paas/roles/systemd_exporter/vars/upstream.yml index 036aa64c..df805dec 100644 --- a/ansible/playbooks/paas/roles/systemd_exporter/vars/upstream.yml +++ b/ansible/playbooks/paas/roles/systemd_exporter/vars/upstream.yml @@ -1,4 +1,4 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" upstream_file_name: "{{ image.upstream.file | replace('REPO', image.upstream.repo) | replace('VERSION', latest_version) | replace('OS', image.upstream.os) | replace('ARCH', upstream_default_arch) | replace('FORMAT', image.upstream.format) }}" upstream_file_url: "https://github.com/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/download/v{{ latest_version }}/{{ upstream_file_name }}" diff --git a/ansible/playbooks/saas/roles/simplestack_ui/vars/upstream.yml b/ansible/playbooks/saas/roles/simplestack_ui/vars/upstream.yml index 7ba80d95..bd4fe371 100644 --- a/ansible/playbooks/saas/roles/simplestack_ui/vars/upstream.yml +++ b/ansible/playbooks/saas/roles/simplestack_ui/vars/upstream.yml @@ -1,2 +1,2 @@ --- -latest_version: "{{ (lookup('url', 'https://api.github.com/repos/{{ image.upstream.user }}/{{ image.upstream.repo }}/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" \ No newline at end of file +latest_version: "{{ (lookup('url', 'https://api.github.com/repos/' + image.upstream.user + '/' + image.upstream.repo + '/releases/latest', headers={'Accept': 'application/vnd.github+json', 'Authorization': 'Bearer ' + lookup('ansible.builtin.env', 'GITHUB_API_TOKEN') }) | from_json).get('tag_name') | replace('v', '') }}" \ No newline at end of file From 9599db0a10040e733c3169cc3b9c3cf0fae175e6 Mon Sep 17 00:00:00 2001 From: Mathieu Garcia Date: Sat, 29 Nov 2025 22:06:13 +0100 Subject: [PATCH 2/2] fix(docker): copy Docker config to standard paths --- .../paas/roles/ansible-docker/defaults/main.yml | 1 - .../paas/roles/ansible-docker/tasks/install.yml | 11 +++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ansible/playbooks/paas/roles/ansible-docker/defaults/main.yml b/ansible/playbooks/paas/roles/ansible-docker/defaults/main.yml index 36380a0a..396e0f46 100644 --- a/ansible/playbooks/paas/roles/ansible-docker/defaults/main.yml +++ b/ansible/playbooks/paas/roles/ansible-docker/defaults/main.yml @@ -1,7 +1,6 @@ --- docker_user: root firewall: true -docker_conf_dir: "/etc/docker" docker_gateway_ip: 172.17.0.1 diff --git a/ansible/playbooks/paas/roles/ansible-docker/tasks/install.yml b/ansible/playbooks/paas/roles/ansible-docker/tasks/install.yml index 2f406869..b99925af 100644 --- a/ansible/playbooks/paas/roles/ansible-docker/tasks/install.yml +++ b/ansible/playbooks/paas/roles/ansible-docker/tasks/install.yml @@ -68,19 +68,22 @@ loop: - /root/.docker -- name: Copy config.json to root directory +- name: Copy config.json ansible.builtin.template: src: config.json.j2 - dest: /root/.docker/config.json + dest: "{{ item }}" owner: root group: root mode: '0600' + loop: + - /root/.docker/config.json + - /etc/docker/config.json notify: Docker_restart -- name: Copy daemon.json for DNS resolution +- name: Copy daemon.json ansible.builtin.template: src: daemon.json.j2 - dest: "{{ docker_conf_dir }}/daemon.json" + dest: /etc/docker/daemon.json owner: root group: root mode: '0600'