diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a88df443d5ddaad1b37645d2578900cf46fc7aa..e8baf1c96a3bce6d6f6c8336934f1b2002aada71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ include: # For jobs that run backend scripts directly .backend-setup: - image: registry.gitlab.com/teklia/arkindex/backend/base:django-4.1.4 + image: registry.gitlab.com/teklia/arkindex/backend/base:django-4.1.5 cache: paths: diff --git a/Dockerfile b/Dockerfile index 922b2d6223cb6f53287772cfff3dad6552dc2aa4..a3f19987c5c3f985e41e75a823337f7abf37e342 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM registry.gitlab.com/teklia/arkindex/backend/base:django-4.1.4 as build +FROM registry.gitlab.com/teklia/arkindex/backend/base:django-4.1.5 as build RUN mkdir build ADD . build RUN cd build && python3 setup.py sdist -FROM registry.gitlab.com/teklia/arkindex/backend/base:django-4.1.4 +FROM registry.gitlab.com/teklia/arkindex/backend/base:django-4.1.5 ARG PONOS_BRANCH=master ARG PONOS_ID=10017043 ARG TRANSKRIBUS_BRANCH=master diff --git a/Dockerfile.binary b/Dockerfile.binary index 04b1639f9de5982b088ee5de81deb1fde4c278fb..289e0c5ff3f04fef34eadccd690774381b26f942 100644 --- a/Dockerfile.binary +++ b/Dockerfile.binary @@ -60,7 +60,7 @@ RUN python -m nuitka \ arkindex/manage.py # Start over from a clean setup -FROM registry.gitlab.com/teklia/arkindex/backend/base:django-4.1.4 as build +FROM registry.gitlab.com/teklia/arkindex/backend/base:django-4.1.5 as build # Import files from compilation RUN mkdir /usr/share/arkindex diff --git a/base/requirements.txt b/base/requirements.txt index 5ea2b7f0ae4fa1db0489b02748793b81804d14bd..1e939430f6afe6cc1ec1ef715da9d71d989dbe22 100644 --- a/base/requirements.txt +++ b/base/requirements.txt @@ -1,5 +1,5 @@ boto3==1.18.13 cryptography==3.4.7 -Django==4.1.4 +Django==4.1.5 lxml==4.6.3 psycopg2-binary==2.9.1