Merge branch 'master' of git.uumas.fi:uumas/ansible-docker

roles/service/defaults/main.yml

@@ -7,6 +7,7 @@ docker_restart_policy: always
 
 reverse_proxy_type: caddy
 docker_proxy_target_protocol: http
+docker_vhost_additional_locations: []
 
 docker_additional_env: {}
 docker_additional_services: []

roles/service/meta/argument_specs.yml

@@ -171,6 +171,7 @@ argument_specs:
       docker_vhost_additional_locations:
         description: "Passed to vhost role as vhost_locations variable"
         required: false
+        default: []
       docker_published_ports:
         description: "A list of published ports in docker format (<host listen address>:<host port>:<container port>)"
         type: list

roles/service/tasks/database.yml

@@ -54,7 +54,7 @@
     docker_image: "{{ db_container_image }}"
     reverse_proxy_type: none
     docker_mounts: "{{ db_container_mounts }}"
-    docker_published_ports: "{{ db_published_ports | default([]) }}"
+    docker_published_ports: "{{ db_published_ports }}"
     docker_env: "{{ db_container_env | default({}) }}"
     docker_additional_env: {}
     docker_networks: []

roles/service/tasks/init.yml

@@ -34,6 +34,7 @@
     container_image: ''
     image_user: ''
     container_networks: []
+    db_published_ports: []
 
 - name: Add suffix to docker_service_name
   ansible.builtin.set_fact:

roles/service/tasks/main.yml

@@ -68,8 +68,8 @@
       ansible.builtin.file:
         path: "{{ docker_mounts_dir }}"
         state: directory
-        owner: "{{ user.uid | default(omit) }}"
-        group: "{{ user.group | default(omit) }}"
+        owner: "{{ user.uid if docker_host_user else omit }}"
+        group: "{{ user.group if docker_host_user else omit }}"
         mode: 0700
 
 - name: Database container