Fix GOVREADY_USERS and libraries

deployments/docker_compose/config-validator.json

@@ -6,6 +6,7 @@
   {"key": "HOST_PORT_HTTP", "required": false, "description":  "GovReady-Q's public address HTTP port; defaults to 80"},
 
   {"key": "ADMINS", "required": false, "description":  "Administrator accounts. Ex: [{\"username\": \"username\", \"email\":\"[email protected]\", \"password\": \"REPLACEME\"}]", "default-message":  "Will auto-create an admin, you need to find it in the logs docker-compose logs"},
+  {"key": "GOVREADY_USERS", "required": false, "description":  "User accounts. Ex: [{\"username\": \"username\", \"email\":\"[email protected]\", \"password\": \"REPLACEME\"}]", "default-message":  "Will auto-create an user, you need to find it in the logs docker-compose logs"},
   {"key": "MOUNT_FOLDER", "required": false, "description":  "Mount folder to put artifacts, logs, etc.", "default-message":  "Current directory."},
   {"key": "GIT_URL", "required": false, "description":  "GovReady-Q Github Repo", "default-message":  "Defaults to https://github.com/GovReady/govready-q.git"},
   {"key": "VERSION", "required": false, "description":  "GovReady-Q version/tag", "default-message":  "Defaulting to latest release."},

deployments/docker_compose/deploy.py

@@ -49,6 +49,7 @@ def run(self):
 
         self.set_default('GIT_URL', "https://github.com/GovReady/govready-q.git")
         self.set_default('ADMINS', [] if not self.config.get('ADMINS') else self.config.get('ADMINS'))
+        self.set_default('GOVREADY_USERS', [] if not self.config.get('GOVREADY_USERS') else self.config.get('GOVREADY_USERS'))
         self.set_default('OKTA', {} if not self.config.get('OKTA') else self.config.get('OKTA'))
         self.set_default('OIDC', {} if not self.config.get('OIDC') else self.config.get('OIDC'))
         self.set_default('MOUNT_FOLDER', os.path.abspath("../../volumes"))

deployments/docker_compose/docker-compose.yaml

@@ -29,6 +29,7 @@ services:
       - SECRET_KEY=${SECRET_KEY-}
       - DEBUG=${DEBUG-}
       - ADMINS=${ADMINS-[]}
+      - GOVREADY_USERS=${GOVREADY_USERS-[]}
       - HEALTH_CHECK_GOVREADY_Q=${HEALTH_CHECK_GOVREADY_Q}
       - EMAIL_HOST=${EMAIL_HOST-}
       - EMAIL_PORT=${EMAIL_PORT-}

images/govready-q/Dockerfile

@@ -52,6 +52,8 @@ WORKDIR /opt/govready-q
 
 
 # Install Python requirements.
+RUN pip3 install --upgrade pip
+RUN pip install --ignore-installed PyYAML
 RUN pip3 install --no-cache-dir -r requirements.txt
 ARG DB_ENGINE
 RUN if [ "$DB_ENGINE" = "mysql" ]; then \
@@ -68,7 +70,7 @@ RUN if [ "$GR_PDF_GENERATOR" = "wkhtmltopdf" ] || [ "$GR_IMG_GENERATOR" = "wkhtm
   fi
 
 # Upgrade gevent (regularly check if this is still necessary)
-RUN pip3 install gevent==21.1.2
+RUN pip3 install gevent==22.10.2
 
 # Install NLP tools
 RUN pip3 install -U spacy

images/govready-q/docker_exec_write_environment.sh

@@ -10,6 +10,7 @@ cat << EOF > local/environment.json
 	"secret-key": $(echo ${SECRET_KEY-} | jq -R .),
 	"syslog": $(echo ${SYSLOG-} | jq -R .),
 	"govready_admins": ${ADMINS-[]},
+	"govready_users": ${GOVREADY_USERS-[]},
 	"static": "static_root",
 	"db": $(echo ${DATABASE_CONNECTION_STRING-} | jq -R .),
 	"allowed_hosts": ${ALLOWED_HOSTS-[]},