diff --git a/defaults/main.yml b/defaults/main.yml index 1891d32..0ad00c7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -15,6 +15,17 @@ dockerengine_secure_registries: [] dockerengine_insecure_registries: [] dockerengine_block_registries: [] +# @var dockerengine_registries:description: List of docker registries to auto login +# @var dockerengine_registries:example: > +# dockerengine_registries: +# - registry: myregistry.example.com (optional) +# username: docker +# password: secure +# reauthorize: False +# state: present +# @end +dockerengine_registries: [] + # @var dockerengine_http_proxy: $ "_unset_" # @var dockerengine_https_proxy: $ "_unset" # @var dockerengine_no_proxy: $ "_unset_" diff --git a/tasks/config.yml b/tasks/config.yml index d8fab84..403ba74 100644 --- a/tasks/config.yml +++ b/tasks/config.yml @@ -15,9 +15,12 @@ group: root mode: 0644 loop: - - { src: 'etc/sysconfig/docker.j2', dest: '/etc/sysconfig/{{ dockerengine_service }}' } - - { src: 'etc/sysconfig/docker-storage-setup.j2', dest: '/etc/sysconfig/{{ dockerengine_service }}-storage-setup' } - - { src: 'etc/containers/registries.conf.j2', dest: '/etc/containers/registries.conf' } + - src: "etc/sysconfig/docker.j2" + dest: "/etc/sysconfig/{{ dockerengine_service }}" + - src: "etc/sysconfig/docker-storage-setup.j2" + dest: "/etc/sysconfig/{{ dockerengine_service }}-storage-setup" + - src: "etc/containers/registries.conf.j2" + dest: "/etc/containers/registries.conf" loop_control: label: "{{ item.dest }}" notify: __docker_restart @@ -57,6 +60,17 @@ enabled: True state: started + - name: Handle registry logins + docker_login: + registry: "{{ item.url | default(omit) }}" + username: "{{ item.username }}" + password: "{{ item.password }}" + reauthorize: "{{ item.reauthorize | default(False) }}" + state: '{{ item.state | default("present") }}' + loop: "{{ dockerengine_registries }}" + loop_control: + label: "{{ item.url }}" + - name: Create docker networks docker_network: name: "{{ item.name }}"