From 24818b510df8ad82e7e682727c4ee3b529e39ff7 Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Thu, 18 Sep 2025 09:41:41 -0400
Subject: [PATCH] Re-apply PR 15862

---
 .gitignore                                             | 1 -
 MANIFEST.in                                            | 1 -
 requirements/requirements_git.credentials.txt          | 2 --
 tools/ansible/roles/dockerfile/templates/Dockerfile.j2 | 3 ---
 4 files changed, 7 deletions(-)
 delete mode 100644 requirements/requirements_git.credentials.txt

diff --git a/.gitignore b/.gitignore
index 1351050ef7..4ea996b190 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,7 +122,6 @@ reports
 local/
 *.mo
 requirements/vendor
-requirements/requirements_git.credentials.txt
 .i18n_built
 .idea/*
 *credentials*.y*ml*
diff --git a/MANIFEST.in b/MANIFEST.in
index 07a75cd25c..b304344c7f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -28,4 +28,3 @@ include COPYING
 include Makefile
 prune awx/public
 prune awx/projects
-prune requirements/requirements_git.credentials.txt
diff --git a/requirements/requirements_git.credentials.txt b/requirements/requirements_git.credentials.txt
deleted file mode 100644
index 1984112ab9..0000000000
--- a/requirements/requirements_git.credentials.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# If sources in requirements_git.txt require authentication add git-credentials in this file, Example:
-# https://x-access-token:${PAT}@github.com"
diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
index 0ae7f8b997..f8ec330eac 100644
--- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
+++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
@@ -79,10 +79,8 @@ RUN mkdir /tmp/requirements
 ADD requirements/requirements.txt \
     requirements/requirements_tower_uninstall.txt \
     requirements/requirements_git.txt \
-    requirements/requirements_git.credentials.txt \
     /tmp/requirements/
 
-RUN git config --global credential.helper "store --file=/tmp/requirements/requirements_git.credentials.txt"
 RUN --mount=type=ssh cd /tmp && make requirements_awx
 
 ARG VERSION
@@ -109,7 +107,6 @@ RUN DJANGO_SETTINGS_MODULE=awx.settings.defaults SKIP_SECRET_KEY_CHECK=yes SKIP_
 
 {% endif %}
 
-RUN rm /tmp/requirements/requirements_git.credentials.txt
 
 # Final container(s)
 FROM quay.io/centos/centos:stream9