Skip to content

Commit

Permalink
Merge pull request #30 from praekeltfoundation/dependabot-security-alert
Browse files Browse the repository at this point in the history
Dependabot security alert
  • Loading branch information
Buhle79 authored Aug 7, 2024
2 parents 7144ac4 + 9a3495b commit 135ce30
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ COPY . /app
RUN pip install -e .

RUN DJANGO_SETTINGS_MODULE=flow_results.testsettings python manage.py collectstatic --noinput
ENV DJANGO_SETTINGS_MODULE flow_results.settings
ENV DEBUG false
ENV DJANGO_SETTINGS_MODULE=flow_results.settings
ENV DEBUG=false

CMD [\
"flow_results.wsgi:application",\
Expand Down
10 changes: 5 additions & 5 deletions flow_results/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
2. Add a URL to urlpatterns: path('blog/', include('blog.urls'))
"""
from django.contrib import admin
from django.urls import include, re_path
from django.urls import include, path

from flows import urls as flow_urls

urlpatterns = [
re_path("admin/", admin.site.urls),
re_path("health/", include("health_check.urls")),
# re_path("", include("django_prometheus.urls")),
re_path("", include(flow_urls.urlpatterns)),
path("admin/", admin.site.urls),
path("health/", include("health_check.urls")),
path("", include("django_prometheus.urls")),
path("", include(flow_urls.urlpatterns)),
]
4 changes: 2 additions & 2 deletions flows/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.urls import include, re_path
from django.urls import include, path
from rest_framework_extensions.routers import ExtendedDefaultRouter

from flows.views import FlowResponseViewSet, FlowViewSet
Expand All @@ -13,5 +13,5 @@
)

urlpatterns = [
re_path("api/v1/", include(v1router.urls)),
path("api/v1/", include(v1router.urls)),
]
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"djangorestframework==3.15.2",
"drf-extensions==0.7.0",
"django-health-check==3.16.3",
"django-prometheus==2.1.0",
"django-prometheus==2.3.1",
"psycopg2-binary==2.9.9",
"sentry-sdk==2.8.0",
"dj-database-url==2.2.0",
Expand Down

0 comments on commit 135ce30

Please sign in to comment.