Merge pull request #914 from lucassz/master

Merged #914
ospc-org · Jul 3, 2018 · 8bd9cff · 8bd9cff
2 parents a0a1dd4 + 52ca793
commit 8bd9cff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/DOCKER.md b/DOCKER.md
@@ -25,9 +25,9 @@ for information on how to set this up on your operating system.
     2. run
     ```
     export PB_VERSION='type current PolicyBrain version here'
-    docker build -t distributed:$PB_VERSION ./
-    docker build -t celery:$PB_VERSION --file Dockerfile.celery ./
-    docker build -t flask:$PB_VERSION --file Dockerfile.flask
+    docker build -t opensourcepolicycenter/distributed:$PB_VERSION ./
+    docker build -t opensourcepolicycenter/celery:$PB_VERSION --build-arg TAG=$PB_VERSION --file Dockerfile.celery ./
+    docker build -t opensourcepolicycenter/flask:$PB_VERSION --build-arg TAG=$PB_VERSION --file Dockerfile.flask ./
     ```
 3. Depending on your system you may have to tweak the Docker memory and CPU
 usage limits. I find that I can do most runs with RAM set around 8 GB and

diff --git a/distributed/api/endpoints.py b/distributed/api/endpoints.py
@@ -13,7 +13,8 @@
 bp = Blueprint('endpoints', __name__)
 
 queue_name = "celery"
-client = redis.StrictRedis(host="redis", port=6379)
+client = redis.StrictRedis.from_url(os.environ.get("CELERY_BROKER_URL",
+                                                   "redis://redis:6379/0"))
 
 
 def dropq_endpoint(dropq_task):