diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b4fa1e7e08a64d8e67f884976b88a2627baf068..1709b117a63fb2442e06b07c5c4299c2cb10db95 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: registry.gitlab.com/arkindex/backend:base-0.10.3 +image: registry.gitlab.com/arkindex/backend:base-0.10.4 stages: - test - build diff --git a/Dockerfile b/Dockerfile index ce22f4979290a90429dd3818ef5987efce7be419..04afc9c28787c93da6a816235f3a5d74a58cd504 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.gitlab.com/arkindex/backend:base-0.10.3 +FROM registry.gitlab.com/arkindex/backend:base-0.10.4 ARG COMMON_BRANCH=master ARG COMMON_ID=9855787 diff --git a/Makefile b/Makefile index 13fb26c9322b281e55131f4f0e23be8dbfce379d..bc51d29cd701be1ff4df8a10b69d261eda5046b9 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ base: require-version docker build $(ROOT_DIR)/base -t registry.gitlab.com/arkindex/backend:base-$(version) docker push registry.gitlab.com/arkindex/backend:base-$(version) sed -i '/image:/s/base-.*$$/base-$(version)/' $(ROOT_DIR)/.gitlab-ci.yml + sed -i '/FROM/s/base-.*$$/base-$(version)/' $(ROOT_DIR)/Dockerfile clean: rm -rf *.egg-info build dist .eggs diff --git a/base/requirements.txt b/base/requirements.txt index bfe8c615742a09802729226c6e2463495a8f27ca..080fcd2b788c0832668eaf500a438a220ff01046 100644 --- a/base/requirements.txt +++ b/base/requirements.txt @@ -1,6 +1,6 @@ boto3==1.9 cryptography>=2.8 -Django==2.2 +Django==2.2.9 elasticsearch==6.2.0 hiredis==1.0.0 ijson==2.3