diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 341362bf942255883d94dcd718b78226d257d0b1..9082fa01461c759ad2cfea81693a3a0a2501e440 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.5 + image: registry.gitlab.com/teklia/arkindex/backend/base:django-4.1.6 cache: paths: diff --git a/Dockerfile b/Dockerfile index 480807d45d76a46da8c44360ffc9e2f89fbdfb03..fc6341acd87b09cc73bd5628a2b7e2f003cf4e9e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM registry.gitlab.com/teklia/arkindex/backend/base:django-4.1.5 as build +FROM registry.gitlab.com/teklia/arkindex/backend/base:django-4.1.6 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.5 +FROM registry.gitlab.com/teklia/arkindex/backend/base:django-4.1.6 ARG TRANSKRIBUS_BRANCH=master ARG TRANSKRIBUS_ID=11180199 ARG GITLAB_TOKEN="gaFM7LRa9zy9QMowcUhx" diff --git a/Dockerfile.binary b/Dockerfile.binary index 0dee3f3f206c3e8dcc2e473e8a2ea2f36e885840..9bb4339838d0d01d6acae4ea68fafc50ad94fe04 100644 --- a/Dockerfile.binary +++ b/Dockerfile.binary @@ -50,7 +50,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.5 as build +FROM registry.gitlab.com/teklia/arkindex/backend/base:django-4.1.6 as build # Import files from compilation RUN mkdir /usr/share/arkindex diff --git a/base/requirements.txt b/base/requirements.txt index 1e939430f6afe6cc1ec1ef715da9d71d989dbe22..18e753c6de03e4f36ef0c42be589d86b217e6716 100644 --- a/base/requirements.txt +++ b/base/requirements.txt @@ -1,5 +1,5 @@ boto3==1.18.13 cryptography==3.4.7 -Django==4.1.5 +Django==4.1.6 lxml==4.6.3 psycopg2-binary==2.9.1