diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2502abba811b1df5c0e5507c1d3ffedc56644660..674ed23fd646d34c1df21137bfebbfd47997f8bb 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-3.1.6 + image: registry.gitlab.com/arkindex/backend/base:django-3.1.7 cache: paths: diff --git a/Dockerfile b/Dockerfile index 0364824492b62a84491173db63b3dd41157659e4..6f0c06e349b7eef5a9eea9b818f315791b982caa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM registry.gitlab.com/arkindex/backend/base:django-3.1.6 as build +FROM registry.gitlab.com/arkindex/backend/base:django-3.1.7 as build RUN mkdir build ADD . build RUN cd build && python3 setup.py sdist -FROM registry.gitlab.com/arkindex/backend/base:django-3.1.6 +FROM registry.gitlab.com/arkindex/backend/base:django-3.1.7 ARG COMMON_BRANCH=master ARG COMMON_ID=9855787 ARG PONOS_BRANCH=master diff --git a/Dockerfile.binary b/Dockerfile.binary index b7ceb02fe8fb5f37aa7ad03812eeb37d88ef16a8..f8cee8314c240744954a4788a90742d3a69a61d2 100644 --- a/Dockerfile.binary +++ b/Dockerfile.binary @@ -65,7 +65,7 @@ RUN python -m nuitka \ arkindex/manage.py # Start over from a clean setup -FROM registry.gitlab.com/arkindex/backend/base:django-3.1.6 as build +FROM registry.gitlab.com/arkindex/backend/base:django-3.1.7 as build # Import files from compilation RUN mkdir /usr/share/arkindex diff --git a/base/requirements.txt b/base/requirements.txt index e82b8235a59751e649155a94024783437d433bf5..e594b86b4f5ffb4a9e7af2523ad3f8c7e4cba77a 100644 --- a/base/requirements.txt +++ b/base/requirements.txt @@ -1,6 +1,6 @@ -boto3==1.15.16 -cryptography>=3.1 +boto3==1.17.11 +cryptography==3.4.6 Django==3.1.7 elasticsearch==6.8.1 -lxml==4.5.2 +lxml==4.6.2 psycopg2-binary==2.8.6