Update Docker config for new architecture

Author: bnaul

Dockerfile

@@ -2,31 +2,31 @@ FROM ubuntu:16.04
 
 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.5 python3-venv libpq-dev libhdf5-serial-dev \
-                       libnetcdf-dev supervisor libpython3-dev supervisor \
-                       nginx npm nodejs && \
+    apt-get install -y python3-venv libpq-dev supervisor libpython3-dev \
+                       git nginx npm nodejs && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     useradd --create-home --shell /bin/bash cesium
 
-RUN python3.5 -m venv /cesium_env && \
+RUN python3 -m venv /cesium_env && \
     \
     bash -c "source /cesium_env/bin/activate && \
     pip install --upgrade pip && \
     pip install --upgrade pip"
 
-ENV PIP_FIND_LINKS http://wheels.scikit-image.org
 ADD . /cesium
 WORKDIR /cesium
 
+ENV LC_ALL=C.UTF-8
+ENV LANG=C.UTF-8
+
 RUN bash -c "source /cesium_env/bin/activate && \
+    ln -s /usr/bin/nodejs /usr/bin/node && \
     make paths && \
     make dependencies && \
     cp docker/cesium-docker.yaml . && \
-    ln -s /usr/bin/nodejs /usr/bin/node && \
     chown -R cesium.cesium /cesium_env && \
     chown -R cesium.cesium /cesium"
 
@@ -38,4 +38,3 @@ CMD bash -c "source /cesium_env/bin/activate && \
   (make log &) && \
   PYTHONPATH=. python -c \"from cesium_app.models import create_tables as c; c()\" && \
   make run"
-

cesium.yaml.example

@@ -3,32 +3,6 @@ app:
                           # characters.  Typically ``os.urandom(24)`` is
                           # good enough.
 
-authentication:
-    # The Stormpath API keys can be downloaded from:
-    # https://api.stormpath.com
-
-    stormpath_api_key_id: 01234
-    stormpath_api_key_secret: 0124
-    stormpath_application: cesium
-
-    ## This section is optional.  If not filled in, Google Authentication
-    ## will be disabled.
-    ##
-    ## These values can be obtained from
-    ##   https://console.developers.google.com/project
-    ##
-    ## When filling in the form for running on localhost:
-    ##
-    ## - Appliation type: Web
-    ## - Authorized JavaScript origins: blank
-    ## - Authorized redirect URIs: http://localhost:5000/google
-    ##                             http://your.hosted.server.com
-    ##
-    ## Always include the localhost:5000 for unit testing purposes.
-
-    google_client_id:
-    google_client_secret:
-
 paths:
     # Note below that defined variables can be reused in subsequent
     # definitions.
@@ -51,20 +25,5 @@ database:
     user: cesium
     password: 
 
-docker:
-    enabled: 0
-
 server:
     url: http://localhost:5000
-
-xr_engine: netcdf4
-##xr_engine: h5netcdf
-
-## testing:
-##    ## Disable authentication
-##    disable_auth: 1
-##
-##    ## Use a separate test database
-##    test_db: 1
-##
-##    debug: 0

docker-compose/docker-compose.yml

@@ -4,26 +4,12 @@ web:
     - "9000:5000"
   links:
     - db
-    - rabbit
   volumes:
     - .:/home/cesium_app
-  environment:
-    - CELERY_BROKER=amqp://guest:guest@rabbit:5672//
-#  depends_on:
-#    - db
-#    - rabbit
 
 db:
   image: cesium/postgres
-#  volumes:
-#    - ./_postgres_data:/var/lib/postgresql/data/
   environment:
     - POSTGRES_USER=cesium
     - POSTGRES_PASSWORD=
     - POSTGRES_DB=cesium
-#    - PGDATA=/var/lib/postgresql/data/pgdata
-
-rabbit:
-  image: rabbitmq:3
-  ports:
-    - "5672:5672"