diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b33e2e97afdf130db1cf7c2a3ceaf8c197a59bc..99827c7c00dc2fa8231fb124946d90c0f26c86ee 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/arkindex/backend/base:django-4 + image: registry.gitlab.com/arkindex/backend/base:django-4.0.2 cache: paths: diff --git a/Dockerfile b/Dockerfile index 89a9270e7b35aed2162961c4779056e3f27cd27e..88527d0a5afcced29739f5f39482a012daf45a17 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM registry.gitlab.com/arkindex/backend/base:django-4 as build +FROM registry.gitlab.com/arkindex/backend/base:django-4.0.2 as build RUN mkdir build ADD . build RUN cd build && python3 setup.py sdist -FROM registry.gitlab.com/arkindex/backend/base:django-4 +FROM registry.gitlab.com/arkindex/backend/base:django-4.0.2 ARG PONOS_BRANCH=master ARG PONOS_ID=10017043 ARG TRANSKRIBUS_BRANCH=master diff --git a/Dockerfile.binary b/Dockerfile.binary index 09cdaecba8d6ee296a8e5940958f1c47eb191434..d7d8682a344e1203ae9259b9a90cb097091b70fd 100644 --- a/Dockerfile.binary +++ b/Dockerfile.binary @@ -61,7 +61,7 @@ RUN python -m nuitka \ arkindex/manage.py # Start over from a clean setup -FROM registry.gitlab.com/arkindex/backend/base:django-4 as build +FROM registry.gitlab.com/arkindex/backend/base:django-4.0.2 as build # Import files from compilation RUN mkdir /usr/share/arkindex diff --git a/base/requirements.txt b/base/requirements.txt index d7840c611f31ec652b3a2d67c76ecbfce54841b7..ef856c6efcc966dea1071cbc27634cf5933e3187 100644 --- a/base/requirements.txt +++ b/base/requirements.txt @@ -1,5 +1,5 @@ boto3==1.18.13 cryptography==3.4.7 -Django==4.0.1 +Django==4.0.2 lxml==4.6.3 psycopg2-binary==2.9.1