From 4e9c7059974dd85a9c5aa3a93a260a79c7a02d68 Mon Sep 17 00:00:00 2001 From: Daniel Temme Date: Fri, 12 Oct 2018 18:36:05 +0200 Subject: [PATCH 1/2] Partial revert for "Bugfix for ca_trust_dir" # Conflicts: # installer/roles/local_docker/tasks/standalone.yml # Conflicts: # installer/roles/local_docker/tasks/standalone.yml --- installer/roles/local_docker/tasks/standalone.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/installer/roles/local_docker/tasks/standalone.yml b/installer/roles/local_docker/tasks/standalone.yml index 44d554ed54..763f96e00b 100644 --- a/installer/roles/local_docker/tasks/standalone.yml +++ b/installer/roles/local_docker/tasks/standalone.yml @@ -82,9 +82,11 @@ state: started restart_policy: unless-stopped image: "{{ awx_web_docker_actual_image }}" - volumes: - - "{{ project_data_dir + ':/var/lib/awx/projects:z' if project_data_dir is defined else [] }}" - - "{{ ca_trust_dir + ':/etc/pki/ca-trust/source/anchors:ro' if ca_trust_dir is defined else [] }}" + volumes: > + {{ + [project_data_dir + ':/var/lib/awx/projects:z'] if project_data_dir is defined else [] + + [ca_trust_dir + ':/etc/pki/ca-trust/source/anchors:ro'] if ca_trust_dir is defined else [] + }} user: root ports: - "{{ host_port }}:8052" From 6ecd18b2e28a673ece8a58390315e1a4f71ea2c4 Mon Sep 17 00:00:00 2001 From: Daniel Temme Date: Mon, 15 Oct 2018 10:44:07 +0200 Subject: [PATCH 2/2] make volume concatenation work The second list gets interpreted as part of the else block, effectively dropping it. Separating both list definitions with braces seems to work. # Conflicts: # installer/roles/local_docker/tasks/standalone.yml --- installer/roles/local_docker/tasks/standalone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/installer/roles/local_docker/tasks/standalone.yml b/installer/roles/local_docker/tasks/standalone.yml index 763f96e00b..ad7a064921 100644 --- a/installer/roles/local_docker/tasks/standalone.yml +++ b/installer/roles/local_docker/tasks/standalone.yml @@ -84,8 +84,8 @@ image: "{{ awx_web_docker_actual_image }}" volumes: > {{ - [project_data_dir + ':/var/lib/awx/projects:z'] if project_data_dir is defined else [] - + [ca_trust_dir + ':/etc/pki/ca-trust/source/anchors:ro'] if ca_trust_dir is defined else [] + ([project_data_dir + ':/var/lib/awx/projects:z'] if project_data_dir is defined else []) + + ([ca_trust_dir + ':/etc/pki/ca-trust/source/anchors:ro'] if ca_trust_dir is defined else []) }} user: root ports: @@ -127,8 +127,8 @@ image: "{{ awx_task_docker_actual_image }}" volumes: > {{ - [project_data_dir + ':/var/lib/awx/projects:z'] if project_data_dir is defined else [] - + [ca_trust_dir + ':/etc/pki/ca-trust/source/anchors:ro'] if ca_trust_dir is defined else [] + ([project_data_dir + ':/var/lib/awx/projects:z'] if project_data_dir is defined else []) + + ([ca_trust_dir + ':/etc/pki/ca-trust/source/anchors:ro'] if ca_trust_dir is defined else []) }} links: "{{ awx_task_container_links|list }}" user: root