Merge pull request #245 from compute-tooling/cs-december

Merge dev branch into master

Dockerfile.dev

@@ -1,3 +1,5 @@
 FROM webbase
 
+RUN conda install -c conda-forge pylint black --yes
+
 CMD gunicorn --bind 0.0.0.0:$PORT webapp.wsgi

distributed/api/__init__.py

@@ -15,3 +15,9 @@ def hello():
     app.register_blueprint(endpoints.bp)
 
     return app
+
+try:
+    app = create_app()
+except Exception as e:
+    print("got exception on import: ", e)
+    app = None

distributed/dockerfiles/Dockerfile

@@ -3,6 +3,15 @@ FROM continuumio/miniconda3
 USER root
 RUN  apt-get update && apt install libgl1-mesa-glx --yes
 
+# install packages for chromium
+RUN apt-get update && \
+    apt-get install -yq --no-install-recommends \
+    libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \
+    libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 \
+    libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 \
+    libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 \
+    libnss3
+
 RUN mkdir /home/distributed
 RUN mkdir /home/distributed/api
 

distributed/dockerfiles/Dockerfile.celerybase

@@ -3,4 +3,3 @@ FROM distributed
 
 ENV CELERY_BROKER_URL redis://redis-master/0
 ENV CELERY_RESULT_BACKEND redis://redis-master/0
-ENV C_FORCE_ROOT true

distributed/dockerfiles/Dockerfile.flask

@@ -7,7 +7,6 @@ USER root
 
 ENV CELERY_BROKER_URL redis://redis-master/0
 ENV CELERY_RESULT_BACKEND redis://redis-master/0
-ENV C_FORCE_ROOT true
 
 ENV HOST 0.0.0.0
 ENV PORT 5050
@@ -34,4 +33,4 @@ RUN cd /home/distributed && pip install -e .
 WORKDIR /home/distributed/api
 
 # run the app server
-CMD ["gunicorn", "--bind", "0.0.0.0:5050", "api:create_app()", "--access-logfile", "-"]
+CMD ["gunicorn", "--bind", "0.0.0.0:5050", "api:app", "--access-logfile", "-"]

distributed/dockerfiles/Dockerfile.tasks

@@ -2,9 +2,10 @@ ARG TAG
 FROM celerybase
 
 # install packages here
-# install packages necessary for celery and dask.
+# install packages necessary for celery and creating screenshots
 RUN pip install -r requirements.txt
 RUN conda install -c conda-forge lz4
+RUN conda install -c conda-forge jinja2 pyppeteer && pyppeteer-install
 
 ARG TITLE
 ARG OWNER

distributed/kubernetes/flower-deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: flower-monitor

distributed/requirements.txt

@@ -7,4 +7,4 @@ flask
 toolz
 gunicorn
 boto3
-cs-storage
+cs-storage>=1.8.1

distributed/templates/flask-deployment.template.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: flask