From ec2a7aa991f74340022e0e5e33ba32b651e2c747 Mon Sep 17 00:00:00 2001
From: Kristofer Hallin <kristofer@sunet.se>
Date: Fri, 12 Nov 2021 11:53:15 +0100
Subject: * Don't switch to main brach, we're already there. * Look for public
 key in /opt/cert. * Add variable to compose.

---
 docker/collector/setup.sh  | 3 ++-
 docker/docker-compose.yaml | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'docker')

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:
-- 
cgit v1.1