diff --git a/profiles/base/Dockerfile b/profiles/base/Dockerfile index b017bf0257..84c1158832 100644 --- a/profiles/base/Dockerfile +++ b/profiles/base/Dockerfile @@ -1,7 +1,7 @@ FROM localhost/oci_env/pulp:base # Define the build argument -ARG DJANGO_ANSIBLE_BASE_BRANCH=devel +ARG DJANGO_ANSIBLE_BASE_BRANCH=2024.10.17 # Set the environment variable based on the build argument ENV DJANGO_ANSIBLE_BASE_BRANCH=${DJANGO_ANSIBLE_BASE_BRANCH} diff --git a/profiles/dab/compose.yaml b/profiles/dab/compose.yaml index decb431d67..7307a9375c 100644 --- a/profiles/dab/compose.yaml +++ b/profiles/dab/compose.yaml @@ -7,14 +7,14 @@ services: _galaxy_base: build: args: - DJANGO_ANSIBLE_BASE_BRANCH: "devel" + DJANGO_ANSIBLE_BASE_BRANCH: "2024.10.17" environment: - DJANGO_ANSIBLE_BASE_BRANCH: "devel" + DJANGO_ANSIBLE_BASE_BRANCH: "2024.10.17" pulp: environment: PULP_WORKERS: "1" - DJANGO_ANSIBLE_BASE_BRANCH: "devel" + DJANGO_ANSIBLE_BASE_BRANCH: "2024.10.17" volumes: pulp_certs: diff --git a/profiles/dab_jwt/compose.yaml b/profiles/dab_jwt/compose.yaml index b64aa809a4..de75830ede 100644 --- a/profiles/dab_jwt/compose.yaml +++ b/profiles/dab_jwt/compose.yaml @@ -7,14 +7,14 @@ services: _galaxy_base: build: args: - DJANGO_ANSIBLE_BASE_BRANCH: "devel" + DJANGO_ANSIBLE_BASE_BRANCH: "2024.10.17" environment: - DJANGO_ANSIBLE_BASE_BRANCH: "devel" + DJANGO_ANSIBLE_BASE_BRANCH: "2024.10.17" pulp: environment: PULP_WORKERS: "1" - DJANGO_ANSIBLE_BASE_BRANCH: "devel" + DJANGO_ANSIBLE_BASE_BRANCH: "2024.10.17" jwtproxy: build: diff --git a/requirements/requirements.common.txt b/requirements/requirements.common.txt index cb38fbbd3c..790c28c6eb 100644 --- a/requirements/requirements.common.txt +++ b/requirements/requirements.common.txt @@ -103,7 +103,7 @@ django==4.2.14 # insights-analytics-collector # pulpcore # social-auth-app-django -django-ansible-base[jwt_consumer] @ git+https://github.com/ansible/django-ansible-base@devel +django-ansible-base[jwt-consumer] @ git+https://github.com/ansible/django-ansible-base@2024.10.17 # via galaxy-ng (setup.py) django-auth-ldap==4.0.0 # via galaxy-ng (setup.py) diff --git a/requirements/requirements.insights.txt b/requirements/requirements.insights.txt index 2b972a1400..1b151a7a95 100644 --- a/requirements/requirements.insights.txt +++ b/requirements/requirements.insights.txt @@ -121,7 +121,7 @@ django==4.2.14 # insights-analytics-collector # pulpcore # social-auth-app-django -django-ansible-base[jwt_consumer] @ git+https://github.com/ansible/django-ansible-base@devel +django-ansible-base[jwt-consumer] @ git+https://github.com/ansible/django-ansible-base@2024.10.17 # via galaxy-ng (setup.py) django-auth-ldap==4.0.0 # via galaxy-ng (setup.py) diff --git a/requirements/requirements.standalone.txt b/requirements/requirements.standalone.txt index 4435b98774..ffbeae7bd2 100644 --- a/requirements/requirements.standalone.txt +++ b/requirements/requirements.standalone.txt @@ -103,7 +103,7 @@ django==4.2.14 # insights-analytics-collector # pulpcore # social-auth-app-django -django-ansible-base[jwt_consumer] @ git+https://github.com/ansible/django-ansible-base@devel +django-ansible-base[jwt-consumer] @ git+https://github.com/ansible/django-ansible-base@2024.10.17 # via galaxy-ng (setup.py) django-auth-ldap==4.0.0 # via galaxy-ng (setup.py) diff --git a/setup.py b/setup.py index 2af715e836..f494562cbf 100644 --- a/setup.py +++ b/setup.py @@ -87,7 +87,7 @@ def run(self): return super().run() -django_ansible_base_branch = os.getenv('DJANGO_ANSIBLE_BASE_BRANCH', 'devel') +django_ansible_base_branch = os.getenv('DJANGO_ANSIBLE_BASE_BRANCH', '2024.10.17') django_ansible_base_dependency = ( 'django-ansible-base[jwt_consumer] @ ' f'git+https://github.com/ansible/django-ansible-base@{django_ansible_base_branch}'