Bump DAB to 2024.12.13

No-Issue Signed-off-by: James Tanner <[email protected]>
ansible · Dec 16, 2024 · 635e58a · 635e58a
1 parent 506ac9d
commit 635e58a
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 14 deletions.
diff --git 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=2024.10.17
+ARG DJANGO_ANSIBLE_BASE_BRANCH=2024.12.13
 
 # 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
@@ -7,14 +7,14 @@ services:
   _galaxy_base:
     build:
       args:
-        DJANGO_ANSIBLE_BASE_BRANCH: "2024.10.17"
+        DJANGO_ANSIBLE_BASE_BRANCH: "2024.12.13"
     environment:
-      DJANGO_ANSIBLE_BASE_BRANCH: "2024.10.17"
+      DJANGO_ANSIBLE_BASE_BRANCH: "2024.12.13"
 
   pulp:
     environment:
       PULP_WORKERS: "1"
-      DJANGO_ANSIBLE_BASE_BRANCH: "2024.10.17"
+      DJANGO_ANSIBLE_BASE_BRANCH: "2024.12.13"
 
 volumes:
   pulp_certs:
diff --git 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: "2024.10.17"
+        DJANGO_ANSIBLE_BASE_BRANCH: "2024.12.13"
     environment:
-      DJANGO_ANSIBLE_BASE_BRANCH: "2024.10.17"
+      DJANGO_ANSIBLE_BASE_BRANCH: "2024.12.13"
 
   pulp:
     environment:
       PULP_WORKERS: "1"
-      DJANGO_ANSIBLE_BASE_BRANCH: "2024.10.17"
+      DJANGO_ANSIBLE_BASE_BRANCH: "2024.12.13"
 
   jwtproxy:
     build:

diff --git a/requirements/requirements.common.txt b/requirements/requirements.common.txt
@@ -106,7 +106,7 @@ django==4.2.17
     #   insights-analytics-collector
     #   pulpcore
     #   social-auth-app-django
-django-ansible-base[jwt-consumer] @ git+https://github.com/ansible/django-ansible-base@2024.10.17
+django-ansible-base[jwt-consumer] @ git+https://github.com/ansible/django-ansible-base@2024.12.13
     # via galaxy-ng (setup.py)
 django-auth-ldap==4.0.0
     # via galaxy-ng (setup.py)
@@ -446,7 +446,9 @@ social-auth-core==4.5.4
     #   galaxy-ng (setup.py)
     #   social-auth-app-django
 sqlparse==0.5.2
-    # via django
+    # via
+    #   django
+    #   django-ansible-base
 subprocess-tee==0.4.2
     # via
     #   ansible-compat

diff --git a/requirements/requirements.insights.txt b/requirements/requirements.insights.txt
@@ -120,7 +120,7 @@ django==4.2.17
     #   insights-analytics-collector
     #   pulpcore
     #   social-auth-app-django
-django-ansible-base[jwt-consumer] @ git+https://github.com/ansible/django-ansible-base@2024.10.17
+django-ansible-base[jwt-consumer] @ git+https://github.com/ansible/django-ansible-base@2024.12.13
     # via galaxy-ng (setup.py)
 django-auth-ldap==4.0.0
     # via galaxy-ng (setup.py)
@@ -468,7 +468,9 @@ social-auth-core==4.5.4
     #   galaxy-ng (setup.py)
     #   social-auth-app-django
 sqlparse==0.5.2
-    # via django
+    # via
+    #   django
+    #   django-ansible-base
 subprocess-tee==0.4.2
     # via
     #   ansible-compat

diff --git a/requirements/requirements.standalone.txt b/requirements/requirements.standalone.txt
@@ -106,7 +106,7 @@ django==4.2.17
     #   insights-analytics-collector
     #   pulpcore
     #   social-auth-app-django
-django-ansible-base[jwt-consumer] @ git+https://github.com/ansible/django-ansible-base@2024.10.17
+django-ansible-base[jwt-consumer] @ git+https://github.com/ansible/django-ansible-base@2024.12.13
     # via galaxy-ng (setup.py)
 django-auth-ldap==4.0.0
     # via galaxy-ng (setup.py)
@@ -446,7 +446,9 @@ social-auth-core==4.5.4
     #   galaxy-ng (setup.py)
     #   social-auth-app-django
 sqlparse==0.5.2
-    # via django
+    # via
+    #   django
+    #   django-ansible-base
 subprocess-tee==0.4.2
     # via
     #   ansible-compat

diff --git 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', '2024.10.17')
+django_ansible_base_branch = os.getenv('DJANGO_ANSIBLE_BASE_BRANCH', '2024.12.13')
 django_ansible_base_dependency = (
     'django-ansible-base[jwt-consumer] @ '
     f'git+https://github.com/ansible/django-ansible-base@{django_ansible_base_branch}'