From 2399eebac63bfd7a57ac95704bd61963380823eb Mon Sep 17 00:00:00 2001 From: Bert-Jan Fikse Date: Fri, 19 Dec 2025 15:10:07 +0100 Subject: [PATCH] feat: add the possibility to add registry mirrors --- roles/base/defaults/main.yml | 5 +++++ roles/base/handlers/main.yml | 6 ++++++ roles/base/tasks/main.yml | 10 ++++++++++ roles/base/templates/daemon.json.j2 | 5 +++++ 4 files changed, 26 insertions(+) create mode 100644 roles/base/templates/daemon.json.j2 diff --git a/roles/base/defaults/main.yml b/roles/base/defaults/main.yml index 14b34ea..36a2b59 100644 --- a/roles/base/defaults/main.yml +++ b/roles/base/defaults/main.yml @@ -7,3 +7,8 @@ docker_compose_base_dir: /etc/docker/compose # Global docker volume directory configuration docker_volume_base_dir: /srv/data + +# Docker registry mirror configuration +# Set to empty list to disable registry mirror +# Example: docker_registry_mirrors: ["https://mirror.example.com"] +docker_registry_mirrors: [] diff --git a/roles/base/handlers/main.yml b/roles/base/handlers/main.yml index 26628e0..290ff62 100644 --- a/roles/base/handlers/main.yml +++ b/roles/base/handlers/main.yml @@ -1,3 +1,9 @@ #SPDX-License-Identifier: MIT-0 --- # handlers file for base + +- name: restart docker + ansible.builtin.systemd: + name: docker + state: restarted + when: ansible_virtualization_type != "docker" diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 4758d77..6be96fa 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -63,6 +63,16 @@ update_cache: true when: ansible_os_family == "Debian" +- name: Configure Docker daemon with registry mirror + ansible.builtin.template: + src: daemon.json.j2 + dest: /etc/docker/daemon.json + owner: root + group: root + mode: '0644' + notify: restart docker + when: ansible_os_family == "Debian" + - name: Start and enable Docker service ansible.builtin.systemd: name: docker diff --git a/roles/base/templates/daemon.json.j2 b/roles/base/templates/daemon.json.j2 new file mode 100644 index 0000000..ff6cdca --- /dev/null +++ b/roles/base/templates/daemon.json.j2 @@ -0,0 +1,5 @@ +{ +{% if docker_registry_mirrors | length > 0 %} + "registry-mirrors": {{ docker_registry_mirrors | to_json }} +{% endif %} +} \ No newline at end of file