I got 99 problems but build issues aren't one

salopensource · Apr 26, 2016 · 97a9fb2 · 97a9fb2
1 parent 35c28d1
commit 97a9fb2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/docker/settings.py b/docker/settings.py
@@ -25,17 +25,29 @@
     }
 
 # PG Database
-if os.environ.has_key('DB_PORT_5432_TCP_ADDR'):
+host = None
+port = None
+
+if os.environ.has_key('DB_HOST'):
+    host = os.environ('DB_HOST')
+    port = os.environ.get('DB_PORT')
+
+elif os.environ.has_key('DB_PORT_5432_TCP_ADDR'):
+    host = os.environ('DB_PORT_5432_TCP_ADDR')
+    port = os.environ.get('DB_PORT_5432_TCP_PORT', '5432')
+
+if host and port:
     DATABASES = {
         'default': {
             'ENGINE': 'django.db.backends.postgresql_psycopg2',
             'NAME': os.environ['DB_NAME'],
             'USER': os.environ['DB_USER'],
             'PASSWORD': os.environ['DB_PASS'],
-            'HOST': os.environ['DB_PORT_5432_TCP_ADDR'],
-            'PORT': os.environ['DB_PORT_5432_TCP_PORT'],
+            'HOST': host,
+            'PORT': port,
         }
     }
+
 if BRUTE_PROTECT==True:
     INSTALLED_APPS+= ('axes',)
     MIDDLEWARE_CLASSES+=('axes.middleware.FailedLoginMiddleware',)
diff --git a/sal/version.plist b/sal/version.plist
@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>version</key>
-	<string>2.6.0.632</string>
+	<string>2.6.0.637</string>
 </dict>
 </plist>
diff --git a/setup/requirements.txt b/setup/requirements.txt
@@ -1,20 +1,20 @@
 Django==1.8.5
 Yapsy==1.11.223
-cffi==1.1.2
+cffi==1.6.0
 cryptography==1.3.1
 django-bootstrap3==5.4.0
 docutils==0.11
-enum34==1.0.4
-idna==2.0
+enum34==1.1.3
+idna==2.1
 ipaddress==1.0.7
 ndg-httpsclient==0.3.2
 pyOpenSSL==16.0.0
-pyasn1==0.1.7
+pyasn1==0.1.8
 pycparser==2.14
 python-dateutil==2.2
 pytz==2014.3
 requests==2.5.0
-six==1.9.0
+six==1.10.0
 urllib3==1.10
 wsgiref==0.1.2
 djangorestframework==3.1.3