From 264c560a8a7eafb15251ad0275bf9436631e4b40 Mon Sep 17 00:00:00 2001
From: beeankha <beeankha@gmail.com>
Date: Thu, 22 Jul 2021 13:28:13 -0400
Subject: [PATCH] Template docker receptor yaml file, update Makefile to
 reflect this change

---
 Makefile                                                  | 2 +-
 tools/docker-compose/ansible/roles/sources/tasks/main.yml | 6 ++++++
 .../roles/sources/templates/docker-receptor.yml.j2}       | 8 ++++----
 3 files changed, 11 insertions(+), 5 deletions(-)
 rename tools/{docker-receptor.yml => docker-compose/ansible/roles/sources/templates/docker-receptor.yml.j2} (93%)

diff --git a/Makefile b/Makefile
index ca7ada2b61..f6a0675323 100644
--- a/Makefile
+++ b/Makefile
@@ -545,7 +545,7 @@ docker-compose-elk: docker-auth awx/projects docker-compose-sources
 	docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/elastic/docker-compose.logstash-link.yml -f tools/elastic/docker-compose.elastic-override.yml up --no-recreate
 
 docker-compose-cluster: docker-auth awx/projects docker-compose-sources
-	docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/docker-receptor.yml up
+	docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/docker-compose/_sources/docker-receptor.yml up
 
 docker-compose-cluster-elk: docker-auth awx/projects docker-compose-sources
 	docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/elastic/docker-compose.logstash-link-cluster.yml -f tools/elastic/docker-compose.elastic-override.yml up --no-recreate
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
similarity index 93%
rename from tools/docker-receptor.yml
rename to 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'