add docker_services_external_networks and docker_services_external_volumes variables

tasks/docker.yml

@@ -1,8 +1,10 @@
 ---
 - name: add official GPG key
-  apt_key:
+  get_url:
     url: https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg
-    state: present
+    dest: /etc/apt/trusted.gpg.d/docker.asc
+    mode: '0644'
+    force: true
   tags: ['docker']
 
 - name: add repository
@@ -21,6 +23,7 @@
       - docker-compose-plugin
       - python3-docker
     state: present
+  ignore_errors: '{{ ansible_check_mode }}'
   tags: ['docker']
 
 - name: create docker-compose directory
@@ -35,6 +38,7 @@
     name: docker
     state: started
     enabled: true
+  ignore_errors: '{{ ansible_check_mode }}'
   tags: ['docker']
 
 - name: copy rsyslog config

tasks/gitlab-runner.yml

@@ -11,11 +11,13 @@
 - name: gitlab-runner | create docker network
   docker_network:
     name: 'gitlab-runner'
+  when: docker_services_external_networks
   tags: ['docker_gitlab-runner']
 
 - name: gitlab-runner | create docker volumes
   docker_volume:
     name: '{{ item }}'
+  when: docker_services_external_volumes
   with_items:
   - gitlab-runner-dind__var_lib_docker
   - gitlab-runner-dind__certs
@@ -56,6 +58,7 @@
       {% if gitlab_runner_extra_hosts is defined %}
           extra_hosts = [{% for host in gitlab_runner_extra_hosts %}"{{ host }}"{{ ", " if not loop.last else "" }}{% endfor %}]
       {% endif %}
+  when: docker_services_external_volumes
   notify: 'gitlab-runner-restart'
   tags: ['docker_gitlab-runner']
 

tasks/gitlab.yml

@@ -12,6 +12,7 @@
 - name: 'gitlab | create docker volumes'
   docker_volume:
     name: '{{ item }}'
+  when: docker_services_external_volumes
   with_items:
   - 'gitlab__etc_config'
   - 'gitlab__var_log_gitlab'
@@ -21,11 +22,13 @@
 - name: 'gitlab | create docker volume backup'
   docker_volume:
     name: 'gitlab__backups'
+  when: docker_services_external_volumes
   tags: ['docker_gitlab']
 
 - name: 'gitlab | create docker volume gitlab__run_secrets'
   docker_volume:
     name: 'gitlab__run_secrets'
+  when: docker_services_external_volumes
   register: 'register_docker_volume_gitlab_gitlab__run_secrets'
   tags: ['docker_gitlab']
 
@@ -34,6 +37,7 @@
     dest: '{{ register_docker_volume_gitlab_gitlab__run_secrets.volume.Mountpoint }}/gitlab_root_password'
     mode: '0600'
     content: '{{ gitlab_root_password }}'
+  when: docker_services_external_volumes
   ignore_errors: '{{ ansible_check_mode }}'
   tags: ['docker_gitlab']
 

tasks/grafana.yml

@@ -14,14 +14,17 @@
 - name: grafana | create docker volume data
   docker_volume:
     name: grafana__var_lib_grafana
+  when: docker_services_external_volumes
   tags: ['docker_grafana']
 
 - name: grafana | create provisioning dashboards docker volume
   docker_volume:
     name: grafana__etc_grafana_provisioning_dashboards
+  when: docker_services_external_volumes
   tags: ['docker_grafana']
 
 - name: grafana | create provisioning datasources docker volume
   docker_volume:
     name: grafana__etc_grafana_provisioning_datasources
+  when: docker_services_external_volumes
   tags: ['docker_grafana']

tasks/requirements.yml

@@ -11,7 +11,6 @@
       - ca-certificates
       - curl
       - gnupg-agent
-      - software-properties-common
       - python3-pip
       - virtualenv
       - python3-setuptools

tasks/traefik.yml

@@ -12,17 +12,20 @@
 - name: traefik | create docker network
   docker_network:
     name: 'traefik'
+  when: docker_services_external_networks
   tags: ['docker_traefik']
 
 - name: traefik | create letsencrypt docker volume
   docker_volume:
     name: traefik__letsencrypt
+  when: docker_services_external_volumes
   register: register_docker_volume_traefik__letsencrypt
   tags: ['docker_traefik']
 
 - name: traefik | create config docker volume
   docker_volume:
     name: traefik__etc_traefik
+  when: docker_services_external_volumes
   register: register_docker_volume_traefik__etc_traefik
   tags: ['docker_traefik']
 
@@ -33,6 +36,7 @@
     owner: root
     group: root
     mode: 0644
+  when: docker_services_external_volumes
   notify: traefik-restart
   tags: ['docker_traefik']
 
@@ -41,4 +45,5 @@
     path: /var/lib/docker/volumes/traefik__etc_traefik/_data/dynamic
     state: directory
     mode: '0755'
+  when: docker_services_external_volumes
   tags: ['docker_traefik']

tasks/wikijs.yml

@@ -25,6 +25,7 @@
 - name: wikijs | create docker network
   docker_network:
     name: 'wikijs'
+  when: docker_services_external_networks
   tags:
     - wikijs
   tags: ['docker_wikijs']
@@ -32,6 +33,7 @@
 - name: wikijs | create docker volumes
   docker_volume:
     name: "{{ item }}"
+  when: docker_services_external_volumes
   with_items:
     - wikijs__config
     - wikijs__data

tasks/wireguard.yml

@@ -11,6 +11,7 @@
 - name: 'wireguard | create docker volumes'
   docker_volume:
     name: '{{ item }}'
+  when: docker_services_external_volumes
   with_items:
     - 'wireguard__etc_wireguard'
   tags: ['docker_wireguard']