Merge stable to master: v2.4.0

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 workflow:
   rules:
-    - if: '$CI_COMMIT_BRANCH =~ /^(demo|stable|staging|test)$/'
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: $CI_COMMIT_BRANCH =~ /^(demo|stable|staging|test)$/
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME !~ /^(demo|master|stable|staging|test)$/
 
 stages:
   - deploy
@@ -31,11 +31,9 @@ clean_test:
   script:
     - ansible-playbook -i $ANSIBLE_INVENTORY $DELETE_PLAYBOOK -e "build_id=$CI_COMMIT_SHORT_SHA"
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^(demo|stable|staging|test)$/
-      when: never
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       when: always
-    - when: on_failure
+    - when: never
 
 clean_gitlab_env:
   stage: clean_env
@@ -47,7 +45,7 @@ clean_gitlab_env:
   script:
     - echo "Cleaning deleted branches from environments"
   rules:
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME !~ /^(demo|stable|staging|test)$/
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
       when: manual
     - when: never
 
@@ -57,16 +55,16 @@ update_proxy:
   script:
     - ansible-playbook -i $ANSIBLE_INVENTORY $UPDATE_PROXY_PLAYBOOK -e "build_id=$CI_COMMIT_SHORT_SHA"
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: never
-    - when: always
+    - if: $CI_COMMIT_BRANCH =~ /^(demo|stable|staging|test)$/
+      when: always
+    - when: never
 
 clean_previous_build:
   stage: clean_build
   environment: $CI_COMMIT_REF_NAME
   script:
     - ansible-playbook -i $ANSIBLE_INVENTORY $DELETE_PLAYBOOK -e "build_id=${CI_COMMIT_BEFORE_SHA:0:8}"
   rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: never
-    - when: always
+    - if: $CI_COMMIT_BRANCH =~ /^(demo|stable|staging|test)$/
+      when: always
+    - when: never

Dockerfile

@@ -5,16 +5,14 @@ ENV PYTHONDONTWRITEBYTECODE 1
 
 RUN mkdir -p /var/log/metax-api/errors && touch /var/log/metax-api/metax-api.json.log
 
-WORKDIR /code
-
-COPY requirements.txt /code/
-
 RUN apt-get update && apt install xqilla libxerces-c-dev build-essential libssl-dev libffi-dev python-dev libxqilla-dev -y
 
-RUN pip install --upgrade pip wheel
-RUN pip install -r requirements.txt
+RUN pip install --upgrade pip wheel poetry
+COPY pyproject.toml poetry.lock /code/
+WORKDIR /code
+RUN poetry config virtualenvs.create false && poetry install --no-interaction --no-ansi --extras "docs simplexquery"
 
 EXPOSE 8008
 EXPOSE 8006
 
-CMD ["python", "manage.py", "runserver", "0.0.0.0:8008"]
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8008"]