Fix Docker containers

Author: stefanv

Dockerfile

@@ -1,31 +1,41 @@
 FROM ubuntu:16.04
 
-ADD . /cesium
-WORKDIR /cesium
-
 RUN apt-get update && \
+    apt-get install -y software-properties-common && \
+    add-apt-repository ppa:fkrull/deadsnakes && \
+    apt-get update && \
     apt-get -y upgrade && \
-    apt-get install -y python3 python3-venv libpq-dev libhdf5-serial-dev \
+    apt-get install -y python3.5 python3-venv libpq-dev libhdf5-serial-dev \
                        libnetcdf-dev supervisor libpython3-dev supervisor \
                        nginx npm nodejs && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
-    \
-    python3 -m venv /cesium_env && \
+    useradd --create-home --shell /bin/bash cesium
+
+RUN python3.5 -m venv /cesium_env && \
     \
     bash -c "source /cesium_env/bin/activate && \
     pip install --upgrade pip && \
-    pip install --upgrade pip && \
-    export PIP_FIND_LINKS=http://wheels.scikit-image.org && \
+    pip install --upgrade pip"
+
+ENV PIP_FIND_LINKS http://wheels.scikit-image.org
+ADD . /cesium
+WORKDIR /cesium
+
+RUN bash -c "source /cesium_env/bin/activate && \
     make paths && \
     make dependencies && \
     cp docker/cesium-docker.yaml . && \
-    ln -s /usr/bin/nodejs /usr/bin/node"
+    ln -s /usr/bin/nodejs /usr/bin/node && \
+    chown -R cesium.cesium /cesium_env && \
+    chown -R cesium.cesium /cesium"
+
+USER cesium
 
 EXPOSE 5000
 
 CMD bash -c "source /cesium_env/bin/activate && \
-  make log & \
+  (make log &) && \
   PYTHONPATH=. python -c \"from cesium_app.models import create_tables as c; c()\" && \
-  supervisord -c conf/supervisord.conf"
+  make run"
 

Makefile

@@ -57,4 +57,4 @@ celery:
 		PYTHONPATH="./cesium_app" celery worker -A cesium_app.celery_app -l info & \
 	else \
 		echo "[Celery] is already running"; \
-        fi
+	fi

cesium_app/celery_app.py

@@ -1,12 +1,8 @@
 from celery import Celery
 from cesium.celery_app import celery_config
 
-import os
-CELERY_BROKER = os.environ.get(
-        'CELERY_BROKER', celery_config['CELERY_BROKER'])
-
 celery_config['CELERY_IMPORTS'].append('cesium_app.celery_tasks')
 #celery_config['CELERY_RESULT_DBURI'] = 'db+postgresql://cesium:cesium@localhost/cesium'
 #celery_config['CELERY_RESULT_BACKEND'] = 'db+postgresql://cesium:cesium@localhost/cesium'
-app = Celery('cesium_app', broker=CELERY_BROKER)
+app = Celery('cesium_app', broker=celery_config['CELERY_BROKER'])
 app.config_from_object(celery_config)

docker-compose/docker-compose.yml

@@ -4,15 +4,14 @@ web:
     - "9000:5000"
   links:
     - db
-    - celery
+    - rabbit
   volumes:
     - .:/home/cesium_app
   environment:
-    - CELERY_BROKER=amqp://guest:guest@rabbit:5672/
+    - CELERY_BROKER=amqp://guest:guest@rabbit:5672//
 #  depends_on:
 #    - db
 #    - rabbit
-#    - celery
 
 db:
   image: cesium/postgres
@@ -28,13 +27,3 @@ rabbit:
   image: rabbitmq:3
   ports:
     - "5672:5672"
-
-celery:
-  image: celery
-#  depends_on:
-#    - rabbit
-  links:
-    - rabbit
-  environment:
-    - CELERY_BROKER=amqp://guest:guest@rabbit:5672/
-    - CELERY_BROKER_URL=amqp://guest:guest@rabbit:5672/

requirements.txt

@@ -10,3 +10,4 @@ pyzmq
 pyjwt
 plotly
 simplejson
+celery