Merge pull request #153 from Amsterdam/feature/maintenance-2023-06-26

Maintenance run 2023-06-26
Amsterdam · Jun 28, 2023 · 18c4939 · 18c4939
2 parents f869aba + 243be0c
commit 18c4939
Show file tree

Hide file tree

Showing 96 changed files with 154 additions and 117 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/.gitignore b/.gitignore
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,16 @@
-FROM amsterdam/python:3.8-buster as app
+FROM python:3.11.4-slim-bullseye as app
 MAINTAINER datapunt@amsterdam.nl
 
 WORKDIR /app/install
+
+RUN apt update -y \
+    && apt upgrade -y \
+    && apt install -y --no-install-recommends gdal-bin \
+    && apt autoremove -y \
+    && apt clean -y \
+    && rm -rf /var/lib/apt/lists/*
+
+
 COPY requirements.txt requirements.txt
 RUN pip install -r requirements.txt
 
@@ -14,6 +23,7 @@ COPY pyproject.toml /app
 ARG SECRET_KEY=not-used
 RUN DATABASE_ENABLED=false python manage.py collectstatic --no-input
 
+RUN groupadd -r datapunt && useradd -r -g datapunt datapunt
 USER datapunt
 
 CMD ["/app/deploy/docker-run.sh"]

diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/LICENSE b/LICENSE
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
diff --git a/doc/data-examples/amsterdamtraveltimes.xsd b/doc/data-examples/amsterdamtraveltimes.xsd
diff --git a/doc/data-examples/amsterdamtraveltimes.xsd.xml b/doc/data-examples/amsterdamtraveltimes.xsd.xml
diff --git a/doc/reistijden-db.png b/doc/reistijden-db.png
diff --git a/docker-compose.override.yml.sample b/docker-compose.override.yml.sample
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/requirements.in b/requirements.in
@@ -4,9 +4,9 @@ django_prometheus
 django-sentry-400-middleware
 drf_amsterdam
 prometheus_client
-psycopg2
+psycopg2-binary
 pyhumps
 python-dateutil
 sentry-sdk
 xmltodict
-datapunt_data_ingress
+datapunt_data_ingress
diff --git a/requirements.txt b/requirements.txt
@@ -1,27 +1,27 @@
 #
-# This file is autogenerated by pip-compile with python 3.10
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
 #
 #    pip-compile --output-file=requirements.txt requirements.in
 #
-asgiref==3.5.2
+asgiref==3.7.2
     # via django
-certifi==2022.9.24
+certifi==2023.5.7
     # via sentry-sdk
 datapunt-data-ingress==2.3.0
     # via -r requirements.in
 defusedxml==0.7.1
     # via djangorestframework-xml
-django==3.2.16
+django==3.2.19
     # via
     #   -r requirements.in
     #   datapunt-data-ingress
     #   django-extensions
     #   django-sentry-400-middleware
     #   djangorestframework
-django-extensions==3.2.1
+django-extensions==3.2.3
     # via -r requirements.in
-django-prometheus==2.2.0
+django-prometheus==2.3.1
     # via -r requirements.in
 django-sentry-400-middleware==0.3.0
     # via -r requirements.in
@@ -39,33 +39,33 @@ drf-amsterdam==0.4.1
     # via -r requirements.in
 drf-extensions==0.7.1
     # via drf-amsterdam
-prometheus-client==0.15.0
+prometheus-client==0.17.0
     # via
     #   -r requirements.in
     #   django-prometheus
-psycopg2==2.9.5
+psycopg2-binary==2.9.6
     # via -r requirements.in
 pyhumps==3.8.0
     # via -r requirements.in
 python-dateutil==2.8.2
     # via -r requirements.in
-pytz==2022.6
+pytz==2023.3
     # via
     #   django
     #   djangorestframework
 raven==6.10.0
     # via django-sentry-400-middleware
-sentry-sdk==1.11.1
+sentry-sdk==1.26.0
     # via -r requirements.in
 six==1.16.0
     # via
     #   djangorestframework-csv
     #   python-dateutil
-sqlparse==0.4.3
+sqlparse==0.4.4
     # via django
 unicodecsv==0.14.1
     # via djangorestframework-csv
-urllib3==1.26.13
+urllib3==2.0.3
     # via sentry-sdk
 xmltodict==0.13.0
     # via -r requirements.in
diff --git a/requirements_dev.in b/requirements_dev.in