From 43b72161ce8d9756d09ec81b13fb2d63b82e730a Mon Sep 17 00:00:00 2001 From: Hao Liu <44379968+TheRealHaoLiu@users.noreply.github.com> Date: Tue, 25 Feb 2025 13:44:36 -0500 Subject: [PATCH] Remove requirements_git.credentials.txt (#15862) Switched to ssh based auth for requirements_git in https://github.com/ansible/awx/pull/15838 --- .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 6c3591e69533..2ee95fb91e70 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 07a75cd25c5b..b304344c7f65 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 1984112ab948..000000000000 --- 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 a11ad015f0e4..2f685c2a6003 100644 --- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 +++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 @@ -74,10 +74,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 cd /tmp && make requirements_awx ARG VERSION @@ -104,7 +102,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