From adb89cd48fbcc5590195b28a92aafccf77f0289d Mon Sep 17 00:00:00 2001
From: Hao Liu <haoli@redhat.com>
Date: Wed, 19 Apr 2023 16:36:51 -0400
Subject: [PATCH] Remove unnecessary egg-link linking

we link awx.egg-link from `tools/docker-compose/awx.egg-link` to `/tmp/awx.egg-link` than we move `/tmp/awx.egg-link` to `/var/lib/awx/venv/awx/lib/python3.9/site-packages/awx.egg-link`

bonus... now we dont have to set PYTHON=python3.9
---
 Makefile                                               | 2 +-
 tools/ansible/roles/dockerfile/templates/Dockerfile.j2 | 5 ++---
 tools/docker-compose/awx.egg-link                      | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 tools/docker-compose/awx.egg-link

diff --git a/Makefile b/Makefile
index 6a5262954fcc..8ec6251f8318 100644
--- a/Makefile
+++ b/Makefile
@@ -300,9 +300,9 @@ api-lint:
 	flake8 awx
 	yamllint -s .
 
+## Run egg_info_dev to generate awx.egg-info for development.
 awx-link:
 	[ -d "/awx_devel/awx.egg-info" ] || $(PYTHON) /awx_devel/tools/scripts/egg_info_dev
-	cp -f /tmp/awx.egg-link /var/lib/awx/venv/awx/lib/$(PYTHON)/site-packages/awx.egg-link
 
 TEST_DIRS ?= awx/main/tests/unit awx/main/tests/functional awx/conf/tests awx/sso/tests
 PYTEST_ARGS ?= -n auto
diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
index c7fd3eed828a..757b93a2d07e 100644
--- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
+++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
@@ -232,7 +232,7 @@ ADD {{ template_dest }}/supervisor_rsyslog.conf /etc/supervisord_rsyslog.conf
 {% endif %}
 
 {% if (build_dev|bool) or (kube_dev|bool) %}
-ADD tools/docker-compose/awx.egg-link /tmp/awx.egg-link
+RUN echo /awx_devel > /var/lib/awx/venv/awx/lib/python3.9/site-packages/awx.egg-link
 ADD tools/docker-compose/awx-manage /usr/local/bin/awx-manage
 ADD tools/scripts/awx-python /usr/bin/awx-python
 {% endif %}
@@ -285,8 +285,7 @@ RUN for dir in \
       /var/lib/shared/overlay-layers/layers.lock \
       /var/lib/shared/vfs-images/images.lock \
       /var/lib/shared/vfs-layers/layers.lock \
-      /var/run/nginx.pid \
-      /var/lib/awx/venv/awx/lib/python3.9/site-packages/awx.egg-link ; \
+      /var/run/nginx.pid; \
     do touch $file ; chmod g+rw $file ; done && \
     echo "\setenv PAGER 'less -SXF'" > /var/lib/awx/.psqlrc
 {% endif %}
diff --git a/tools/docker-compose/awx.egg-link b/tools/docker-compose/awx.egg-link
deleted file mode 100644
index bce047d3545c..000000000000
--- a/tools/docker-compose/awx.egg-link
+++ /dev/null
@@ -1 +0,0 @@
-/awx_devel
\ No newline at end of file