Merge pull request #212 from Teichlab/develop

Develop

.dockerignore

@@ -1,6 +1,5 @@
 ./in/
 ./out/
-./docker/
 .dockerignore
 .git
 ./venv

.gitlab-ci.yml

@@ -0,0 +1,20 @@
+image: docker:latest
+services:
+  - docker:dind
+
+variables:
+  IMAGE_BASENAME: registry.gitlab.com/$CI_PROJECT_PATH:$CI_COMMIT_REF_SLUG
+  DOCKER_DRIVER: overlay2
+
+stages:
+  - build
+
+before_script:
+  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
+
+build-cellphonedb-queries:
+  stage: build
+  script:
+    - docker pull $IMAGE_BASENAME || true
+    - docker build --cache-from $IMAGE_BASENAME --pull -t $IMAGE_BASENAME .
+    - docker push $IMAGE_BASENAME

Dockerfile

@@ -1,11 +1,15 @@
 ARG PYTHON_VERSION=3.7
 FROM python:$PYTHON_VERSION
 
-RUN mkdir /app
+RUN mkdir /app /docker
 COPY requirements.txt /app
+COPY requirements-web.txt /app
 WORKDIR /app
 
 RUN pip install -r requirements.txt
+RUN pip install -r requirements-web.txt
 COPY . /app
-
-CMD python -m unittest
+COPY ./docker /docker
+RUN mkdir -p /var/log/uwsgi
+RUN touch /var/log/uwsgi/cellphonedb.log
+CMD ["/docker/run-system.sh"]

cellphonedb.ini

@@ -5,11 +5,10 @@ master = true
 processes = 4
 
 
-socket = /tmp/cellphonedb.sock
+socket = 0.0.0.0:5000
 chmod-socket = 660
 vacuum = true
 
 die-on-term = true
 
-logto = /var/log/uwsgi/%n.log
 stats = /tmp/stats.socket

docker/run-system.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec uwsgi --ini cellphonedb.ini --log-master

requirements-web.txt

@@ -0,0 +1 @@
+uWSGI>=2.0,<2.0.99