Merge branch 'master' into migrate-to-django-filter-v2

unioslo · Apr 22, 2024 · 630faf8 · 630faf8
2 parents bd4fe41 + d45d257
commit 630faf8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # build stage
-FROM python:3.10-alpine as builder
+FROM python:3.11-alpine as builder
 WORKDIR /usr/src/mreg
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
@@ -11,7 +11,7 @@ COPY requirements*.txt ./
 RUN pip wheel --no-cache-dir --wheel-dir /usr/src/mreg/wheels -r requirements.txt
 
 # final stage
-FROM alpine:3.17
+FROM alpine:3.18
 EXPOSE 8000
 
 COPY requirements*.txt entrypoint* manage.py /app/

diff --git a/requirements.txt b/requirements.txt
@@ -1,12 +1,12 @@
-Django==3.2.23
+Django==3.2.25
 djangorestframework==3.14.0
 django-auth-ldap==4.0.0
 django-netfields==1.2.4
 django-filter==23.1
 structlog==23.1.0
 rich==13.4.2
-gunicorn==20.1.0
-idna==3.4
+gunicorn==22.0.0
+idna==3.7
 psycopg2-binary==2.9.5
 pika==1.3.1
 sentry-sdk==1.15.0