adding secrets to the other collections

docker-compose.dem.yml

@@ -129,6 +129,10 @@ services:
       - env/dem_db.env
       - env/dem_obs.env
       - env/dem_redis.env
+    secrets:
+      - OS_PASSWORD
+      - OS_PASSWORD_DOWNLOAD
+      - DJANGO_PASSWORD
     environment:
       INSTANCE_ID: "prism-view-server_registrar"
       INSTALL_DIR: "/var/www/pvs/dev/"
@@ -138,6 +142,9 @@ services:
       INIT_SCRIPTS: "/configure.sh /init-db.sh /initialized.sh"
       STARTUP_SCRIPTS: "/wait-initialized.sh"
       WAIT_SERVICES: "redis:6379 database:5432"
+      OS_PASSWORD_FILE: /run/secrets/os_password
+      OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
+      DJANGO_PASSWORD_FILE: "/run/secrets/DJANGO_PASSWORD"
     configs:
       - source: init-db
         target: /init-db.sh
@@ -169,3 +176,10 @@ volumes:
   instance-data:
 networks:
   intnet:
+secrets:
+  OS_PASSWORD:
+    external: true
+  OS_PASSWORD_DOWNLOAD:
+    external: true
+  DJANGO_PASSWORD:
+    external: true

docker-compose.emg.yml

@@ -130,7 +130,9 @@ services:
       - env/emg_obs.env
       - env/emg_redis.env
     secrets:
-      - os_password
+      - OS_PASSWORD
+      - OS_PASSWORD_DOWNLOAD
+      - DJANGO_PASSWORD
     environment:
       INSTANCE_ID: "prism-view-server_registrar"
       INSTALL_DIR: "/var/www/pvs/dev/"
@@ -141,6 +143,8 @@ services:
       STARTUP_SCRIPTS: "/wait-initialized.sh"
       WAIT_SERVICES: "redis:6379 database:5432"
       OS_PASSWORD_FILE: /run/secrets/os_password
+      OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
+      DJANGO_PASSWORD_FILE: "/run/secrets/DJANGO_PASSWORD"
     configs:
       - source: init-db
         target: /init-db.sh
@@ -173,5 +177,9 @@ volumes:
 networks:
   intnet:
 secrets:
-  os_password:
-    file: OS_PASSWORD.txt
+  OS_PASSWORD:
+    external: true
+  OS_PASSWORD_DOWNLOAD:
+    external: true
+  DJANGO_PASSWORD:
+    external: true
\ No newline at end of file

env_setup

-#!/usr/bin/env python3
-# jsonenv reads a json object as input and produces
-# escaped shell commands for setting environment vars
-
-import json
-import pipes
-import os
-import sys
-
-
-
-for k, v in json.load(sys.stdin).items():
-    k = pipes.quote(k)
-    v = pipes.quote(v)
-    print("%s=%s" % (k, v))
\ No newline at end of file

env_setup.sh

@@ -6,7 +6,6 @@ cat $vhr18_obs > ./env/vhr18_obs.env
 cat $emg_db > ./env/emg_db.env
 cat $emg_django > ./env/emg_django.env
 cat $emg_obs > ./env/emg_obs.env
-echo "OS_PASSWORD=${OS_PASSWORD}" >> ./OS_PASSWORD.txt
 
 set -o allexport
 

setup_env.sh

-#!/bin/sh
-chmode +x env_setup
-cat > /run/secrets/my_secret > secrets.json
-./env_setup <secrets.json >secrets.csv
-
-
-IFS="="
-while read  key value ; do
-        export $key=$value
-        echo "${key}=${value}" 
-done < secrets.csv