* Don't switch to main brach, we're already there.

* Look for public key in /opt/cert.
* Add variable to compose.

3 files changed, 7 insertions, 5 deletions

diff --git a/docker/collector/setup.sh b/docker/collector/setup.sh
index 77627d4..73f1a43 100755
--- a/docker/collector/setup.sh
+++ b/docker/collector/setup.sh
@@ -2,7 +2,8 @@
 
 pip3 install uwsgi
 cd /opt/collector/
-git checkout main
 virtualenv venv
 . venv/bin/activate
 pip3 install -r requirements.txt
+
+mkdir /opt/certs/
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index e89964d..31e22d4 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -7,6 +7,7 @@ services:
       - COUCHDB_PASSWORD
       - COUCHDB_NAME
       - COUCHDB_HOSTNAME
+      - JWT_PUBKEY_PATH
     ports:
       - 80:80
     volumes:
diff --git a/src/wsgi.py b/src/wsgi.py
index e090876..1b257cd 100755
--- a/src/wsgi.py
+++ b/src/wsgi.py
@@ -29,13 +29,13 @@ else:
 
 def get_pubkey():
     try:
-        keypath = os.environ['JWT_PUBKEY_PATH']
+        if 'keypath' in os.environ:
+            keypath = os.environ['JWT_PUBKEY_PATH']
+        else:
+            keypath = '/opt/cert/public.pem'
 
         with open(keypath, "r") as fd:
             pubkey = fd.read()
-    except KeyError:
-        print("Could not find environment variable JWT_PUBKEY_PATH")
-        sys.exit(-1)
     except FileNotFoundError:
         print(f"Could not find JWT certificate in {keypath}")
         sys.exit(-1)