Merge pull request #898 from hdoupe/vers-updates

Merged #898
ospc-org · Jun 13, 2018 · f564125 · f564125
2 parents 041bee5 + de653ce
commit f564125
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/RELEASES.md b/RELEASES.md
@@ -16,11 +16,13 @@ Release 1.6.0 on 2018-06-??
 - [#888](https://github.com/OpenSourcePolicyCenter/PolicyBrain/pull/888) - Remove no longer used gevent script - Hank Doupe
 - [#889](https://github.com/OpenSourcePolicyCenter/PolicyBrain/pull/889) - Use heroku container registry to deploy the webapp - Hank Doupe
 - [#891](https://github.com/OpenSourcePolicyCenter/PolicyBrain/pull/891) - Add formatting to warn/error messge banner - Hank Doupe
+- [#898](https://github.com/OpenSourcePolicyCenter/PolicyBrain/pull/898) - Update Docker image versions for 1.6.0_rc4 and RELEASES.md - Hank Doupe
 
 **Bug Fixes**
 - [#882](https://github.com/OpenSourcePolicyCenter/PolicyBrain/pull/882) - Check hostnames to make sure they are current before pinging them (applied as hot fix) - Hank Doupe
 - [#893](https://github.com/OpenSourcePolicyCenter/PolicyBrain/pull/893) - Quick dynamic app parameter fixes - Hank Doupe
-- [#895](ttps://github.com/OpenSourcePolicyCenter/PolicyBrain/pull/895) - Rename CNN.jpg to cnn.jpg so CSS can find it - Hank Doupe
+- [#895](https://github.com/OpenSourcePolicyCenter/PolicyBrain/pull/895) - Rename CNN.jpg to cnn.jpg so CSS can find it - Hank Doupe
+- [#897](https://github.com/OpenSourcePolicyCenter/PolicyBrain/pull/897) - Complete PR 688 (Adding dynamic CDNs for the widgets) - Anderson Frailey and Haylee Ham
 
 Release 1.5.1 on 2018-03-30
 ----------------------------

diff --git a/distributed/Dockerfile b/distributed/Dockerfile
@@ -1,6 +1,6 @@
 FROM continuumio/miniconda
 
-LABEL build="distributed" date="2018-03-30"
+LABEL build="distributed" date="2018-06-13"
 USER root
 RUN  apt-get update && apt install libgl1-mesa-glx --yes
 

diff --git a/distributed/Dockerfile.celery b/distributed/Dockerfile.celery
@@ -1,6 +1,6 @@
-FROM opensourcepolicycenter/distributed:v1.6.0_rc1
+FROM opensourcepolicycenter/distributed:v1.6.0_rc4
 
-LABEL build="celery" date="2018-03-30"
+LABEL build="celery" date="2018-06-13"
 
 ENV CELERY_BROKER_URL redis://redis:6379/0
 ENV CELERY_RESULT_BACKEND redis://redis:6379/0

diff --git a/distributed/Dockerfile.flask b/distributed/Dockerfile.flask
@@ -1,6 +1,6 @@
-FROM opensourcepolicycenter/distributed:v1.6.0_rc1
+FROM opensourcepolicycenter/distributed:v1.6.0_rc4
 
-LABEL build="flask" date="2018-03-30"
+LABEL build="flask" date="2018-06-13"
 
 USER root
 

diff --git a/distributed/docker-compose.yml b/distributed/docker-compose.yml
@@ -1,13 +1,13 @@
 version: '3'
 services:
   flask:
-    image: opensourcepolicycenter/flask:v1.5.0.1
+    image: opensourcepolicycenter/flask:v1.6.0_rc4
     ports:
       - 5050:5050
     depends_on:
       - redis
   celery:
-    image: opensourcepolicycenter/celery:v1.5.0.1
+    image: opensourcepolicycenter/celery:v1.6.0_rc4
     depends_on:
       - redis
   redis:

diff --git a/webapp/settings.py b/webapp/settings.py
@@ -150,7 +150,7 @@
 
 # Use whitenoise to serve static files
 STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
-SENDGRID_API_KEY=os.environ.get("SENDGRID_API_KEY", "")
+SENDGRID_API_KEY=os.environ.get("SENDGRID_API_KEY", "not-specified")
 EMAIL_BACKEND = "sgbackend.SendGridBackend"
 BLOG_URL = os.environ.get('BLOG_URL', 'http://news.ospc.org/')