From c07b3003373b6f4d3b5e35ee7eb67898ad5b8c73 Mon Sep 17 00:00:00 2001
From: Kristofer Hallin <kristofer@sunet.se>
Date: Tue, 16 Nov 2021 14:32:39 +0100
Subject: Use DOCKER_JWT_PUBKEY_PATH for public key and some minor fixes.

---
 docker/collector/Dockerfile | 1 -
 docker/collector/setup.sh   | 5 +++++
 docker/docker-compose.yaml  | 6 +-----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'docker')

diff --git a/docker/collector/Dockerfile b/docker/collector/Dockerfile
index b84a56a..68514a7 100644
--- a/docker/collector/Dockerfile
+++ b/docker/collector/Dockerfile
@@ -8,7 +8,6 @@ RUN apt clean
 
 WORKDIR /opt/
 
-RUN mkdir certs
 RUN git clone https://git.sunet.se/soc_collector.git /opt/collector
 
 WORKDIR /opt/collector/
diff --git a/docker/collector/setup.sh b/docker/collector/setup.sh
index 73f1a43..53f1ae8 100755
--- a/docker/collector/setup.sh
+++ b/docker/collector/setup.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
 
+if [ ! -d /opt/certs/ ]; then
+    echo "Creating certs/ directory."
+    mkdir /opt/certs/
+fi
+
 pip3 install uwsgi
 cd /opt/collector/
 virtualenv venv
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 31e22d4..c7ebbfb 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -11,9 +11,7 @@ services:
     ports:
       - 80:80
     volumes:
-      - type: volume
-        source: collector-certs
-        target: /opt/certs/
+      - ${DOCKER_JWT_PUBKEY_PATH}:/opt/certs/:ro
     depends_on:
       - couchdb
 
@@ -30,7 +28,5 @@ services:
         target: /opt/couchdb/data
 
 volumes:
-  collector-certs:
-    external: false
   couchdb-data:
     external: false
-- 
cgit v1.1