Skip to content

Commit

Permalink
Pin dab to the 2024.10.17 tag.
Browse files Browse the repository at this point in the history
No-Issue

Signed-off-by: James Tanner <[email protected]>
  • Loading branch information
jctanner committed Oct 17, 2024
1 parent d2a3f2e commit 0da17d2
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion profiles/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
6 changes: 3 additions & 3 deletions profiles/dab/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
6 changes: 3 additions & 3 deletions profiles/dab_jwt/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements.common.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements.insights.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion requirements/requirements.standalone.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}'
Expand Down

0 comments on commit 0da17d2

Please sign in to comment.