From 545613de98c276bd2ba30987df93088037fec59d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 11:21:10 +0100 Subject: [PATCH 1/5] build(deps): bump django from 3.2.23 to 3.2.24 (#523) Bumps [django](https://github.com/django/django) from 3.2.23 to 3.2.24. - [Commits](https://github.com/django/django/compare/3.2.23...3.2.24) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d94acdd9..fbedb4a3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==3.2.23 +Django==3.2.24 djangorestframework==3.13.1 django-auth-ldap==4.0.0 django-netfields==1.2.4 From 4888aa9fa23038fa55567df6c13c9a9891b50673 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 23:24:02 +0100 Subject: [PATCH 2/5] build(deps): bump django from 3.2.24 to 3.2.25 (#524) Bumps [django](https://github.com/django/django) from 3.2.24 to 3.2.25. - [Commits](https://github.com/django/django/compare/3.2.24...3.2.25) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fbedb4a3..4fc4eac0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==3.2.24 +Django==3.2.25 djangorestframework==3.13.1 django-auth-ldap==4.0.0 django-netfields==1.2.4 From 74e4e1ece1f6c5fef4740eb80551a82cb9d87914 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 12:28:04 +0200 Subject: [PATCH 3/5] build(deps): bump idna from 3.4 to 3.7 (#525) Bumps [idna](https://github.com/kjd/idna) from 3.4 to 3.7. - [Release notes](https://github.com/kjd/idna/releases) - [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst) - [Commits](https://github.com/kjd/idna/compare/v3.4...v3.7) --- updated-dependencies: - dependency-name: idna dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4fc4eac0..7d90d9a2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ structlog==23.1.0 # For colorful console output during development. rich==13.4.2 gunicorn==20.1.0 -idna==3.4 +idna==3.7 psycopg2-binary==2.9.5 pika==1.3.1 sentry-sdk==1.15.0 From f927cdb994c63f3f39a167e17b9823abce9e62d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:24:49 +0000 Subject: [PATCH 4/5] build(deps): bump gunicorn from 20.1.0 to 22.0.0 (#526) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 7d90d9a2..987ebe54 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ django-url-filter==0.3.15 structlog==23.1.0 # For colorful console output during development. rich==13.4.2 -gunicorn==20.1.0 +gunicorn==22.0.0 idna==3.7 psycopg2-binary==2.9.5 pika==1.3.1 From d45d25756c5476efa3c8051c77519b7f20687e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Hagberg?= Date: Mon, 22 Apr 2024 15:29:42 +0200 Subject: [PATCH 5/5] Bump base image versions in Dockerfile Recently, building the container images started to fail: https://github.com/unioslo/mreg/actions/runs/8784288442/job/24102213934 This can be fixed by using newer versions of the base images. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6fecaca0..a479eabf 100644 --- 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/