Merge pull request #172 from devinmatte/docker

Fixing Build Error and Updating Version

Author: com6056

Dockerfile

@@ -8,7 +8,7 @@ ADD requirements.txt /opt/conditional
 WORKDIR /opt/conditional
 
 RUN apt-get -yq update && \
-    apt-get -yq install libsasl2-dev python-dev libldap2-dev libssl-dev && \
+    apt-get -yq install libsasl2-dev libldap2-dev libssl-dev && \
     pip install -r requirements.txt && \
     apt-get -yq clean all
 

conditional/__init__.py

@@ -2,7 +2,6 @@
 from ._version import __version__
 
 import os
-import subprocess
 from datetime import datetime
 
 from csh_ldap import CSHLDAP
@@ -23,10 +22,7 @@
 
 app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
 
-app.config["GIT_REVISION"] = subprocess.check_output(['git',
-                                                      'rev-parse',
-                                                      '--short',
-                                                      'HEAD']).decode('utf-8').rstrip()
+app.config["VERSION"] = __version__
 
 db = SQLAlchemy(app)
 migrate = Migrate(app, db)

conditional/_version.py

@@ -1 +1 @@
-__version__ = "1.6.1"
+__version__ = "1.7.0"

conditional/config.py

@@ -1,9 +1,12 @@
+import secrets
 from os import environ as env
+
 from conditional import __version__
 
 # Flask config
 DEBUG = True if env.get("CONDITIONAL_DEBUG", "false").lower() == "true" else False
 HOST_NAME = env.get("CONDITIONAL_HOST_NAME", "conditional.csh.rit.edu")
+SERVER_NAME = env.get('CONDITIONAL_SERVER_NAME', 'conditional.csh.rit.edu')
 APP_NAME = "conditional"
 IP = env.get("CONDITIONAL_IP", "0.0.0.0")
 PORT = env.get("CONDITIONAL_PORT", 6969)
@@ -31,5 +34,8 @@
     'post_logout_redirect_uris': [env.get("CONDITIONAL_OIDC_CLIENT_LOGOUT", "http://0.0.0.0:6969/logout")]
 }
 
+# Openshift secret
+SECRET_KEY = env.get("CONDITIONAL_SECRET_KEY", default=''.join(secrets.token_hex(16)))
+
 # General config
 DUES_PER_SEMESTER = env.get("CONDITIONAL_DUES_PER_SEMESTER", 80)

conditional/templates/base.html

@@ -36,7 +36,7 @@ <h3>Evaluations underway:</h3>
         {% endif %}
 
         <footer>
-            <a class="footer-version" href="https://github.com/ComputerScienceHouse/conditional/tree/{{config["GIT_REVISION"]}}">Conditional ({{config["GIT_REVISION"]}})</a>
+            <a class="footer-version" href="https://github.com/ComputerScienceHouse/conditional/tree/v{{config["VERSION"]}}">Conditional (v{{config["VERSION"]}})</a>
         </footer>
         <script src="/static/js/app.js"></script>
     </body>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "conditional",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "description": "CSH Re-evaluation (MEGA_EVALS RE:RE:LOADED)",
   "license": "MIT",
   "homepage": "http://csh.rit.edu/",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "bootstrap": "^3.3.6",
-    "bootstrap-material-datetimepicker": "^2.7.3",
+    "bootstrap-material-datetimepicker": "https://github.com/T00rk/bootstrap-material-datetimepicker.git#gh-pages",
     "bootstrap-sass": "^3.3.6",
     "bootstrap-sweetalert": "^1.0.1",
     "csh-material-bootstrap": "1.0.0",