diff options
| author | beeankha <beeankha@gmail.com> | 2021-07-22 19:28:13 +0200 |
|---|---|---|
| committer | Alan Rominger <arominge@redhat.com> | 2021-08-24 14:40:21 +0200 |
| commit | 264c560a8a7eafb15251ad0275bf9436631e4b40 (patch) | |
| tree | 190636db1915cbe99144a9c26ef52981a6b8aab6 /tools | |
| parent | Pull in user's uid vs hardcode to 1000 (diff) | |
| download | awx-264c560a8a7eafb15251ad0275bf9436631e4b40.tar.xz awx-264c560a8a7eafb15251ad0275bf9436631e4b40.zip | |
Template docker receptor yaml file, update Makefile to reflect this change
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker-compose/ansible/roles/sources/tasks/main.yml | 6 | ||||
| -rw-r--r-- | tools/docker-compose/ansible/roles/sources/templates/docker-receptor.yml.j2 (renamed from tools/docker-receptor.yml) | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/tools/docker-compose/ansible/roles/sources/tasks/main.yml b/tools/docker-compose/ansible/roles/sources/tasks/main.yml index 55937b4051..9cb959441e 100644 --- a/tools/docker-compose/ansible/roles/sources/tasks/main.yml +++ b/tools/docker-compose/ansible/roles/sources/tasks/main.yml @@ -81,3 +81,9 @@ src: docker-compose.yml.j2 dest: "{{ sources_dest }}/{{ compose_name }}" mode: '0600' + +- name: Render Docker-Compose (Receptor) + template: + src: docker-receptor.yml.j2 + dest: "{{ sources_dest }}/docker-receptor.yml" + mode: '0600' diff --git a/tools/docker-receptor.yml b/tools/docker-compose/ansible/roles/sources/templates/docker-receptor.yml.j2 index 57e3ca657d..574349cf43 100644 --- a/tools/docker-receptor.yml +++ b/tools/docker-compose/ansible/roles/sources/templates/docker-receptor.yml.j2 @@ -9,7 +9,7 @@ # ^-------------- <receptor-3> # --- -version: '2' +version: '2.1' services: awx_1: environment: @@ -30,7 +30,7 @@ services: - "../../docker-compose-cluster:/etc/receptor" receptor-1: image: quay.io/awx/awx_devel:devel - user: "1000" + user: "{{ ansible_user_uid }}" container_name: tools_receptor_1 hostname: receptor-1 command: 'receptor --config /etc/receptor/awx-1-receptor.conf' @@ -42,7 +42,7 @@ services: privileged: true receptor-2: image: quay.io/awx/awx_devel:devel - user: "1000" + user: "{{ ansible_user_uid }}" container_name: tools_receptor_2 hostname: receptor-2 command: 'receptor --config /etc/receptor/awx-2-receptor.conf' @@ -54,7 +54,7 @@ services: privileged: true receptor-3: image: quay.io/awx/awx_devel:devel - user: "1000" + user: "{{ ansible_user_uid }}" container_name: tools_receptor_3 hostname: receptor-3 command: 'receptor --config /etc/receptor/awx-3-receptor.conf' |